mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/i386: kvm: Fix when nested state is needed for migration

Browse Source 
When vCPU is in VMX operation and enters SMM mode,
it temporarily exits VMX operation but KVM maintained nested-state
still stores the VMXON region physical address, i.e. even when the
vCPU is in SMM mode then (nested_state->hdr.vmx.vmxon_pa != -1ull).

Therefore, there is no need to explicitly check for
KVM_STATE_NESTED_SMM_VMXON to determine if it is necessary
to save nested-state as part of migration stream.

Reviewed-by: Karl Heubaum <karl.heubaum@oracle.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Message-Id: <20190624230514.53326-1-liran.alon@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Liran Alon 2019-06-25 02:05:14 +03:00 committed by Paolo Bonzini
parent 6b7ac49d57
commit ec7b1bbd2c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/i386/machine.c
View File

@ -997,9 +997,8 @@ static bool vmx_nested_state_needed(void *opaque)
{ {
struct kvm_nested_state *nested_state = opaque; struct kvm_nested_state *nested_state = opaque;
return ((nested_state->format == KVM_STATE_NESTED_FORMAT_VMX) && return (nested_state->format == KVM_STATE_NESTED_FORMAT_VMX &&
((nested_state->hdr.vmx.vmxon_pa != -1ull) || nested_state->hdr.vmx.vmxon_pa != -1ull);
(nested_state->hdr.vmx.smm.flags & KVM_STATE_NESTED_SMM_VMXON)));
} }
static const VMStateDescription vmstate_vmx_nested_state = { static const VMStateDescription vmstate_vmx_nested_state = {