From patchwork Sun May 3 14:04:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 21625 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n43E4Lie026863 for ; Sun, 3 May 2009 14:04:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753951AbZECOER (ORCPT ); Sun, 3 May 2009 10:04:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753711AbZECOEP (ORCPT ); Sun, 3 May 2009 10:04:15 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37329 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752408AbZECOEN (ORCPT ); Sun, 3 May 2009 10:04:13 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n43E4915030828; Sun, 3 May 2009 10:04:11 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n43E46ZN028911; Sun, 3 May 2009 10:04:06 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n43E44xP009864; Sun, 3 May 2009 10:04:05 -0400 Received: from localhost.localdomain (dhcp-1-197.tlv.redhat.com [10.35.1.197]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 4EAACA0170; Sun, 3 May 2009 17:04:04 +0300 (IDT) From: Avi Kivity To: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH 3/4] Fix x86 feature modifications for features that set multiple bits Date: Sun, 3 May 2009 17:04:03 +0300 Message-Id: <1241359444-8538-4-git-send-email-avi@redhat.com> In-Reply-To: <1241359444-8538-1-git-send-email-avi@redhat.com> References: <1241359444-8538-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org QEMU allows adding or removing cpu features by using the syntax '-cpu +feature' or '-cpu -feature'. Some cpuid features cause more than one bit to be set or cleared; but QEMU stops after just one bit has been modified, causing the feature bits to be inconsistent. Fix by allowing all feature bits corresponding to a given name to be set. Signed-off-by: Avi Kivity --- target-i386/helper.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 88585b8..0c91133 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -66,28 +66,31 @@ static void add_flagname_to_bitmaps(char *flagname, uint32_t *features, uint32_t *ext3_features) { int i; + int found = 0; for ( i = 0 ; i < 32 ; i++ ) if (feature_name[i] && !strcmp (flagname, feature_name[i])) { *features |= 1 << i; - return; + found = 1; } for ( i = 0 ; i < 32 ; i++ ) if (ext_feature_name[i] && !strcmp (flagname, ext_feature_name[i])) { *ext_features |= 1 << i; - return; + found = 1; } for ( i = 0 ; i < 32 ; i++ ) if (ext2_feature_name[i] && !strcmp (flagname, ext2_feature_name[i])) { *ext2_features |= 1 << i; - return; + found = 1; } for ( i = 0 ; i < 32 ; i++ ) if (ext3_feature_name[i] && !strcmp (flagname, ext3_feature_name[i])) { *ext3_features |= 1 << i; - return; + found = 1; } - fprintf(stderr, "CPU feature %s not found\n", flagname); + if (!found) { + fprintf(stderr, "CPU feature %s not found\n", flagname); + } } typedef struct x86_def_t {