From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M0cIk-0000Y1-Ln for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M0cIg-0000XO-S4 for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:18 -0400 Received: from [199.232.76.173] (port=49135 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M0cIg-0000X6-AS for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:14 -0400 Received: from mx2.redhat.com ([66.187.237.31]:58435) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M0cIf-00029h-Em for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:13 -0400 From: Avi Kivity 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> Subject: [Qemu-devel] [PATCH 3/4] Fix x86 feature modifications for features that set multiple bits List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, 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 { -- 1.6.1.1