From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M6EZs-0007bC-DM for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M6EZn-0007aH-IP for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:11 -0400 Received: from [199.232.76.173] (port=33552 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M6EZn-0007aB-Dc for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:07 -0400 Received: from mx2.redhat.com ([66.187.237.31]:60238) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M6EZl-0001BJ-TC for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:07 -0400 From: Glauber Costa Date: Mon, 18 May 2009 21:57:00 -0400 Message-Id: <1242698221-32463-3-git-send-email-glommer@redhat.com> In-Reply-To: <1242698221-32463-2-git-send-email-glommer@redhat.com> References: <1242698221-32463-1-git-send-email-glommer@redhat.com> <1242698221-32463-2-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH STABLE 2/3] 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: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, Avi Kivity From: Avi Kivity 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 Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- 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 3eb9697..1433857 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.5.6.6