From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Avi Kivity To: stable@vger.kernel.org Cc: Marcelo Tosatti , kvm@vger.kernel.org Subject: [PATCH 05/11] KVM: x86 emulator: correctly mask pmc index bits in RDPMC instruction emulation Date: Wed, 9 May 2012 16:10:41 +0300 Message-Id: <1336569047-23576-6-git-send-email-avi@redhat.com> In-Reply-To: <1336569047-23576-1-git-send-email-avi@redhat.com> References: <1336569047-23576-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: From: Gleb Natapov Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity (cherry picked from commit 270c6c79f4e15e599f47174ecedad932463af7a2) --- arch/x86/kvm/pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 1.7.10.1