From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBDiY-0002fw-HP for qemu-devel@nongnu.org; Sat, 16 Apr 2011 18:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QBDiW-0002Ch-Sl for qemu-devel@nongnu.org; Sat, 16 Apr 2011 18:11:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBDiW-0002Bx-Jc for qemu-devel@nongnu.org; Sat, 16 Apr 2011 18:11:48 -0400 From: Marcelo Tosatti Date: Sat, 16 Apr 2011 19:10:04 -0300 Message-Id: <8f53372986d7726c02fe0147e45be504a5208edc.1302991808.git.mtosatti@redhat.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH 2/6] kvm: add kvmclock to its second bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Glauber Costa , qemu-devel@nongnu.org, kvm@vger.kernel.org, Avi Kivity From: Glauber Costa We have two bits that can represent kvmclock in cpuid. They signal the guest which msr set to use. When we tweak flags involving this value - specially when we use "-", we have to act on both. Besides adding it to the kvm features list, we also have to "break" the assumption represented by the break in lookup_feature. Signed-off-by: Glauber Costa Signed-off-by: Avi Kivity --- target-i386/cpuid.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 814d13e..5e48d35 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -73,7 +73,7 @@ static const char *ext3_feature_name[] = { }; static const char *kvm_feature_name[] = { - "kvmclock", "kvm_nopiodelay", "kvm_mmu", NULL, "kvm_asyncpf", NULL, NULL, NULL, + "kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvmclock", "kvm_asyncpf", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -193,7 +193,6 @@ static int lookup_feature(uint32_t *pval, const char *s, const char *e, for (mask = 1, ppc = featureset; mask; mask <<= 1, ++ppc) if (*ppc && !altcmp(s, e, *ppc)) { *pval |= mask; - break; } return (mask ? 1 : 0); } -- 1.7.4.2