From: Gleb Natapov <gleb@redhat.com>
Date: Thu, 16 Feb 2012 12:44:11 +0000 (+0200)
Subject: KVM: x86 emulator: correctly mask pmc index bits in RDPMC instruction emulation
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=270c6c79f4e15e599f47174ecedad932463af7a2;p=deliverable%2Flinux.git

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>
---

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index 7aad5446f393..3e48c1d3edcd 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)