projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b062b79
)
kvm: nVMX: Restore exit qual for VM-entry failure due to MSR loading
author
Jim Mattson
<jmattson@google.com>
Wed, 30 May 2018 23:00:02 +0000
(16:00 -0700)
committer
Paolo Bonzini
<pbonzini@redhat.com>
Sun, 15 Jul 2018 14:29:48 +0000
(16:29 +0200)
This exit qualification was inadvertently dropped when the two
VM-entry failure blocks were coalesced.
Fixes:
e79f245ddec1
("X86/KVM: Properly update 'tsc_offset' to represent the running guest")
Signed-off-by: Jim Mattson <jmattson@google.com>
Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/vmx.c
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/vmx.c
b/arch/x86/kvm/vmx.c
index
12ed6a8
..
ba98145
100644
(file)
--- a/
arch/x86/kvm/vmx.c
+++ b/
arch/x86/kvm/vmx.c
@@
-11431,7
+11431,6
@@
static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry)
{
struct vcpu_vmx *vmx = to_vmx(vcpu);
struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
- u32 msr_entry_idx;
u32 exit_qual;
int r;
@@
-11453,10
+11452,10
@@
static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry)
nested_get_vmcs12_pages(vcpu, vmcs12);
r = EXIT_REASON_MSR_LOAD_FAIL;
-
msr_entry_idx
= nested_vmx_load_msr(vcpu,
-
vmcs12->vm_entry_msr_load_addr,
-
vmcs12->vm_entry_msr_load_count);
- if (
msr_entry_idx
)
+
exit_qual
= nested_vmx_load_msr(vcpu,
+ vmcs12->vm_entry_msr_load_addr,
+ vmcs12->vm_entry_msr_load_count);
+ if (
exit_qual
)
goto fail;
/*