aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-05-03 17:04:03 +0300
committerAnthony Liguori <aliguori@us.ibm.com>2009-05-08 15:42:52 -0500
commit02b049df49b3f2709130d4e01838314697a4cdfc (patch)
tree59cd0cd24978c194b27363acb418a56b23e3186a
parentc6fa82c4e90d629e16f8dda990f63cec73103cac (diff)
downloadqemu-02b049df49b3f2709130d4e01838314697a4cdfc.zip
qemu-02b049df49b3f2709130d4e01838314697a4cdfc.tar.gz
qemu-02b049df49b3f2709130d4e01838314697a4cdfc.tar.bz2
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 <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--target-i386/helper.c13
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 {