leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kvm-basic-exit-reason' into HEAD

Browse Source 
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>
This commit is contained in:
Paolo Bonzini
2020-06-09 06:08:48 -04:00
parent 80fbd280be 2ebac8bb3c
commit 77f81f37fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kvm/vmx/nested.c
View File

@@ -5672,7 +5672,7 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason)
{ {
u32 intr_info; u32 intr_info;
switch (exit_reason) { switch ((u16)exit_reason) {
case EXIT_REASON_EXCEPTION_NMI: case EXIT_REASON_EXCEPTION_NMI:
intr_info = vmx_get_intr_info(vcpu); intr_info = vmx_get_intr_info(vcpu);
if (is_nmi(intr_info)) 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); struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
u32 intr_info; u32 intr_info;
switch (exit_reason) { switch ((u16)exit_reason) {
case EXIT_REASON_EXCEPTION_NMI: case EXIT_REASON_EXCEPTION_NMI:
intr_info = vmx_get_intr_info(vcpu); intr_info = vmx_get_intr_info(vcpu);
if (is_nmi(intr_info)) if (is_nmi(intr_info))