summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bader <stefan.bader@canonical.com>2012-08-09 12:33:12 +0300
committerBen Hutchings <ben@decadent.org.uk>2012-08-19 18:15:28 +0100
commit6929d33d596f654d9bc9fbe840112a2f687f99c3 (patch)
tree854c23f6bb48fb8c80cd34fe8bf17a1cfb5e4c86
parent840ba4a248e09231cbdc5e9ac769a1f83bee4748 (diff)
KVM: VMX: Advertise CPU_BASED_RDPMC_EXITING for nested guests
Based on commit fee84b079d5ddee2247b5c1f53162c330c622902 upstream. Intercept RDPMC and forward it to the PMU emulation code. Newer vmx support will only allow to load the kvm_intel module if RDPMC_EXITING is supported. Even without the actual support this part of the change is required on 3.2 hosts. BugLink: http://bugs.launchpad.net/bugs/1031090 Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--arch/x86/kvm/vmx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 73154887f46d..407789b00e72 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1956,6 +1956,7 @@ static __init void nested_vmx_setup_ctls_msrs(void)
#endif
CPU_BASED_MOV_DR_EXITING | CPU_BASED_UNCOND_IO_EXITING |
CPU_BASED_USE_IO_BITMAPS | CPU_BASED_MONITOR_EXITING |
+ CPU_BASED_RDPMC_EXITING |
CPU_BASED_ACTIVATE_SECONDARY_CONTROLS;
/*
* We can allow some features even when not supported by the