From: Jan Kiszka Subject: [PATCH v2 2b/6] kvm: add kvmclock to its second bit Date: Tue, 19 Apr 2011 13:06:24 +0200 Message-ID: <4DAD6CB0.9030608@siemens.com> References: <8f53372986d7726c02fe0147e45be504a5208edc.1302991808.git.mtosatti@redhat.com> <4DAAC8B9.7020708@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Anthony Liguori , qemu-devel@nongnu.org, kvm@vger.kernel.org, Avi Kivity To: Marcelo Tosatti , Glauber Costa Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:47128 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754616Ab1DSLG3 (ORCPT ); Tue, 19 Apr 2011 07:06:29 -0400 In-Reply-To: <4DAAC8B9.7020708@web.de> Sender: kvm-owner@vger.kernel.org List-ID: 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. [Jan: factored out lookup_feature changes] Signed-off-by: Jan Kiszka --- target-i386/cpuid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 0ac592f..e479a4d 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, -- 1.7.1