KVM: x86: allow KVM_STATE_NESTED_MTF_PENDING in kvm_state flags
Subsystems (4)
Paolo Bonzini
maintainerPATCH 1/1 KVM: x86: allow KVM_STATE_NESTED_MTF_PENDING in kvm_state flags
The migration functionality was left incomplete in commit 5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing instruction emulation", 2020-02-23), fix it.
Fixes 5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing instruction emulation")
Signed-off-by Paolo Bonzini <[email protected]>
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -4626,7 +4626,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,if (kvm_state.flags & ~(KVM_STATE_NESTED_RUN_PENDING |KVM_STATE_NESTED_GUEST_MODE - |KVM_STATE_NESTED_EVMCS )) + |KVM_STATE_NESTED_EVMCS |KVM_STATE_NESTED_MTF_PENDING ))break ;/* nested_run_pending implies guest_mode. */
Signature · 1 line
2.18.2
Quoted 8 lines · Paolo Bonzini
The migration functionality was left incomplete in commit
5ef8acbdd687("KVM: nVMX: Emulate MTF when performing instruction emulation", 2020-02-23), fix it.Fixes 5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing instruction emulation")Signed-off-by Paolo Bonzini <[email protected]>
Reviewed-by Oliver Upton <[email protected]>
Quoted 20 lines
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/kvm/x86.c +1
-2@@ -4626,7 +4626,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,if (kvm_state.flags & ~(KVM_STATE_NESTED_RUN_PENDING |KVM_STATE_NESTED_GUEST_MODE - |KVM_STATE_NESTED_EVMCS )) + |KVM_STATE_NESTED_EVMCS |KVM_STATE_NESTED_MTF_PENDING ))break ;/* nested_run_pending implies guest_mode. */ --2.18.2
Quoted 16 lines · Paolo Bonzini
The migration functionality was left incomplete in commit
5ef8acbdd687("KVM: nVMX: Emulate MTF when performing instruction emulation", 2020-02-23), fix it.Fixes 5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing instruction emulation")Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/kvm/x86.c +0
-0
arch/x86/kvm/x86.c long kvm_arch_vcpu_ioctl(struct file *filp, · line 4632
Quoted 8 lines
arch/x86/kvm/x86.c +1
-1@@ -4626,7 +4626,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,if (kvm_state.flags & ~(KVM_STATE_NESTED_RUN_PENDING |KVM_STATE_NESTED_GUEST_MODE - |KVM_STATE_NESTED_EVMCS )) + |KVM_STATE_NESTED_EVMCS |KVM_STATE_NESTED_MTF_PENDING ))break ;/* nested_run_pending implies guest_mode. */
Reviewed-by Vitaly Kuznetsov <[email protected]>
Signature · 1 line
Vitaly