diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-06-09 12:08:48 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-06-11 18:35:14 +0200 |
| commit | 77f81f37fb1fdce76304cc7858e91b223bfcef72 (patch) | |
| tree | da9016e882d7f29f76b8cc80f69b05fa454ca999 /arch/x86/kvm/vmx | |
| parent | KVM: x86: Unexport x86_fpu_cache and make it static (diff) | |
| parent | KVM: nVMX: Consult only the "basic" exit reason when routing nested exit (diff) | |
| download | linux-77f81f37fb1fdce76304cc7858e91b223bfcef72.tar.xz linux-77f81f37fb1fdce76304cc7858e91b223bfcef72.zip | |
Merge branch 'kvm-basic-exit-reason' into HEAD
Using a topic branch so that stable branches can simply cherry-pick the
patch.
Reviewed-by: Oliver Upton <oupton@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx')
| -rw-r--r-- | arch/x86/kvm/vmx/nested.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index bcb50724be38..adb11b504d5c 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -5672,7 +5672,7 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason) { u32 intr_info; - switch (exit_reason) { + switch ((u16)exit_reason) { case EXIT_REASON_EXCEPTION_NMI: intr_info = vmx_get_intr_info(vcpu); if (is_nmi(intr_info)) @@ -5733,7 +5733,7 @@ static bool nested_vmx_l1_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason) struct vmcs12 *vmcs12 = get_vmcs12(vcpu); u32 intr_info; - switch (exit_reason) { + switch ((u16)exit_reason) { case EXIT_REASON_EXCEPTION_NMI: intr_info = vmx_get_intr_info(vcpu); if (is_nmi(intr_info)) |