From patchwork Tue Apr 19 11:06:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 717851 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3JB6Wqe008374 for ; Tue, 19 Apr 2011 11:06:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768Ab1DSLG3 (ORCPT ); Tue, 19 Apr 2011 07:06:29 -0400 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 Received: from smtp07.web.de ( [172.20.5.215]) by fmmailgate02.web.de (Postfix) with ESMTP id 08B6919C133A3; Tue, 19 Apr 2011 13:06:28 +0200 (CEST) Received: from [88.66.126.216] (helo=mchn199C.mchp.siemens.de) by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1QC8lG-0000kX-00; Tue, 19 Apr 2011 13:06:27 +0200 Message-ID: <4DAD6CB0.9030608@siemens.com> Date: Tue, 19 Apr 2011 13:06:24 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Marcelo Tosatti , Glauber Costa CC: Anthony Liguori , qemu-devel@nongnu.org, kvm@vger.kernel.org, Avi Kivity Subject: [PATCH v2 2b/6] kvm: add kvmclock to its second bit References: <8f53372986d7726c02fe0147e45be504a5208edc.1302991808.git.mtosatti@redhat.com> <4DAAC8B9.7020708@web.de> In-Reply-To: <4DAAC8B9.7020708@web.de> X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18KJEynG3fv8W79uem7Z5tFBK4Iu0fjXTzsd8ve oGE4qxjxO4bTyZVSc9eaGJzL+4GpeJm79us67/7XTzBPuHsN50 nctUn24r8= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 11:06:33 +0000 (UTC) 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,