Commit ec7b1bbd authored by Liran Alon's avatar Liran Alon Committed by Paolo Bonzini
Browse files

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



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: default avatarKarl Heubaum <karl.heubaum@oracle.com>
Signed-off-by: default avatarLiran Alon <liran.alon@oracle.com>
Message-Id: <20190624230514.53326-1-liran.alon@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6b7ac49d

target/i386/machine.c

+2 −3
Original line number Diff line number Diff line
@@ -997,9 +997,8 @@ static bool vmx_nested_state_needed(void *opaque) 
{

    struct kvm_nested_state *nested_state = opaque;



    return ((nested_state->format == KVM_STATE_NESTED_FORMAT_VMX) &&

            ((nested_state->hdr.vmx.vmxon_pa != -1ull) ||

             (nested_state->hdr.vmx.smm.flags & KVM_STATE_NESTED_SMM_VMXON)));

    return (nested_state->format == KVM_STATE_NESTED_FORMAT_VMX &&

            nested_state->hdr.vmx.vmxon_pa != -1ull);

}



static const VMStateDescription vmstate_vmx_nested_state = {