summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-31 17:02:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-31 17:02:58 -0700
commit7a611e69b26069a511d9d5251c6a28af6c521121 (patch)
treec50ea6727f349f59905c96f1561a7f338630d3ce /arch
parenta16d9d25c364dc0f4f9e4af7dad829e7ced07e47 (diff)
parent1d92128fe9e30c2340283361957a840f108e4abf (diff)
downloadlinux-3.10-7a611e69b26069a511d9d5251c6a28af6c521121.tar.gz
linux-3.10-7a611e69b26069a511d9d5251c6a28af6c521121.tar.bz2
linux-3.10-7a611e69b26069a511d9d5251c6a28af6c521121.zip
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM bugfixes from Marcelo Tosatti. * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: fix KVM_GET_MSR for PV EOI kvm: Fix nonsense handling of compat ioctl
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/x86.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index dce75b76031..148ed666e31 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2000,6 +2000,9 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
case MSR_KVM_STEAL_TIME:
data = vcpu->arch.st.msr_val;
break;
+ case MSR_KVM_PV_EOI_EN:
+ data = vcpu->arch.pv_eoi.msr_val;
+ break;
case MSR_IA32_P5_MC_ADDR:
case MSR_IA32_P5_MC_TYPE:
case MSR_IA32_MCG_CAP: