From cf6c4edfab98f587405ec61cd727ad70eeb9984e Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 3 May 2009 17:04:03 +0300 Subject: [PATCH STABLE 2/3] Fix x86 feature modifications for features that set multiple bits 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(-) Index: qemu-kvm-0.10.4/target-i386/helper.c =================================================================== --- qemu-kvm-0.10.4.orig/target-i386/helper.c +++ qemu-kvm-0.10.4/target-i386/helper.c @@ -68,28 +68,31 @@ static void add_flagname_to_bitmaps(char 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); + } } extern const char *cpu_vendor_string;