summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2012-02-16 14:44:11 +0200
committerAvi Kivity <avi@redhat.com>2012-03-08 14:10:24 +0200
commit270c6c79f4e15e599f47174ecedad932463af7a2 (patch)
tree551493b3175eb9ec80a92aab806fadc6ce0c758e /arch/x86/kvm
parent565f3be2174611f364405bbea2d86e153c2e7e78 (diff)
downloadop-kernel-dev-270c6c79f4e15e599f47174ecedad932463af7a2.zip
op-kernel-dev-270c6c79f4e15e599f47174ecedad932463af7a2.tar.gz
KVM: x86 emulator: correctly mask pmc index bits in RDPMC instruction emulation
Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index 7aad544..3e48c1d 100644
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -413,7 +413,7 @@ int kvm_pmu_read_pmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data)
struct kvm_pmc *counters;
u64 ctr;
- pmc &= (3u << 30) - 1;
+ pmc &= ~(3u << 30);
if (!fixed && pmc >= pmu->nr_arch_gp_counters)
return 1;
if (fixed && pmc >= pmu->nr_arch_fixed_counters)
OpenPOWER on IntegriCloud