diff options
| author | Peter Maydell | 2019-07-25 10:59:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-25 10:59:00 +0200 |
| commit | 7ea53245335b4f60b56a3323232baa39d9bb1ebb (patch) | |
| tree | 73db4800470400ff616a8e58a7b86df2ad9199ea /target | |
| parent | Update version for v4.1.0-rc2 release (diff) | |
| parent | docs: correct kconfig option (diff) | |
| download | qemu-7ea53245335b4f60b56a3323232baa39d9bb1ebb.tar.gz qemu-7ea53245335b4f60b56a3323232baa39d9bb1ebb.tar.xz qemu-7ea53245335b4f60b56a3323232baa39d9bb1ebb.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Two more bugfix patches + 1 doc fix.
# gpg: Signature made Wed 24 Jul 2019 10:22:06 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
docs: correct kconfig option
i386/kvm: Do not sync nested state during runtime
virtio-scsi: fixed virtio_scsi_ctx_check failed when detaching scsi disk
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/i386/kvm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index ada89d27cc..dbbb13772a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -3563,12 +3563,12 @@ int kvm_arch_put_registers(CPUState *cpu, int level) assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu)); - ret = kvm_put_nested_state(x86_cpu); - if (ret < 0) { - return ret; - } - if (level >= KVM_PUT_RESET_STATE) { + ret = kvm_put_nested_state(x86_cpu); + if (ret < 0) { + return ret; + } + ret = kvm_put_msr_feature_control(x86_cpu); if (ret < 0) { return ret; |