From patchwork Thu Mar 17 22:42:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 642481 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 p2HMgQ5i007286 for ; Thu, 17 Mar 2011 22:42:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755274Ab1CQWmZ (ORCPT ); Thu, 17 Mar 2011 18:42:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54696 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755487Ab1CQWmP (ORCPT ); Thu, 17 Mar 2011 18:42:15 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2HMgE3X007750 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 17 Mar 2011 18:42:14 -0400 Received: from mothafucka.localdomain (ovpn-113-137.phx2.redhat.com [10.3.113.137]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2HMg8Mv016845; Thu, 17 Mar 2011 18:42:13 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: qemu-devel@nongnu.org, avi@redhat.com, mtosatti@redhat.com Subject: [PATCH 2/3] add kvmclock to its second bit Date: Thu, 17 Mar 2011 19:42:06 -0300 Message-Id: <1300401727-5235-3-git-send-email-glommer@redhat.com> In-Reply-To: <1300401727-5235-1-git-send-email-glommer@redhat.com> References: <1300401727-5235-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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]); Thu, 17 Mar 2011 22:42:27 +0000 (UTC) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index d28de20..48f9bbd 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); }