diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-01 02:02:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-01 02:02:58 +0200 |
| commit | 7a611e69b26069a511d9d5251c6a28af6c521121 (patch) | |
| tree | c50ea6727f349f59905c96f1561a7f338630d3ce /arch | |
| parent | Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jej... (diff) | |
| parent | KVM: x86: fix KVM_GET_MSR for PV EOI (diff) | |
| download | linux-7a611e69b26069a511d9d5251c6a28af6c521121.tar.xz linux-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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index dce75b760312..148ed666e311 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: |