proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-14 12:07:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow overriding of CPUID level on command line

Browse Source 
The CPUID level determines how many CPUID leafs are exposed to the guest.
Some features (like multi-core) cannot be propagated without the proper
level, but guests maybe confused by bogus entries in some leafs.
So add level= and xlevel= to the list of -cpu options to allow the user to
override the default settings. While at it, merge unnecessary local
variables into one and allow hexadecimal arguments.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andre Przywara 2009-08-20 21:03:48 +02:00 committed by Anthony Liguori
parent 400281af34
commit a8a358bf35
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
target-i386/helper.c
View File

@ -349,7 +349,7 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
char *featurestr, *name = strtok(s, ","); char *featurestr, *name = strtok(s, ",");
uint32_t plus_features = 0, plus_ext_features = 0, plus_ext2_features = 0, plus_ext3_features = 0; uint32_t plus_features = 0, plus_ext_features = 0, plus_ext2_features = 0, plus_ext3_features = 0;
uint32_t minus_features = 0, minus_ext_features = 0, minus_ext2_features = 0, minus_ext3_features = 0; uint32_t minus_features = 0, minus_ext_features = 0, minus_ext2_features = 0, minus_ext3_features = 0;
int family = -1, model = -1, stepping = -1; uint32_t numvalue;
def = NULL; def = NULL;
for (i = 0; i < ARRAY_SIZE(x86_defs); i++) { for (i = 0; i < ARRAY_SIZE(x86_defs); i++) {
@ -381,28 +381,47 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
*val = 0; val++; *val = 0; val++;
if (!strcmp(featurestr, "family")) { if (!strcmp(featurestr, "family")) {
char *err; char *err;
family = strtol(val, &err, 10); numvalue = strtoul(val, &err, 0);
if (!*val || *err || family < 0) { if (!*val || *err) {
fprintf(stderr, "bad numerical value %s\n", val); fprintf(stderr, "bad numerical value %s\n", val);
goto error; goto error;
} }
x86_cpu_def->family = family; x86_cpu_def->family = numvalue;
} else if (!strcmp(featurestr, "model")) { } else if (!strcmp(featurestr, "model")) {
char *err; char *err;
model = strtol(val, &err, 10); numvalue = strtoul(val, &err, 0);
if (!*val || *err || model < 0 || model > 0xff) { if (!*val || *err || numvalue > 0xff) {
fprintf(stderr, "bad numerical value %s\n", val); fprintf(stderr, "bad numerical value %s\n", val);
goto error; goto error;
} }
x86_cpu_def->model = model; x86_cpu_def->model = numvalue;
} else if (!strcmp(featurestr, "stepping")) { } else if (!strcmp(featurestr, "stepping")) {
char *err; char *err;
stepping = strtol(val, &err, 10); numvalue = strtoul(val, &err, 0);
if (!*val || *err || stepping < 0 || stepping > 0xf) { if (!*val || *err || numvalue > 0xf) {
fprintf(stderr, "bad numerical value %s\n", val); fprintf(stderr, "bad numerical value %s\n", val);
goto error; goto error;
} }
x86_cpu_def->stepping = stepping; x86_cpu_def->stepping = numvalue ;
} else if (!strcmp(featurestr, "level")) {
char *err;
numvalue = strtoul(val, &err, 0);
if (!*val || *err) {
fprintf(stderr, "bad numerical value %s\n", val);
goto error;
}
x86_cpu_def->level = numvalue;
} else if (!strcmp(featurestr, "xlevel")) {
char *err;
numvalue = strtoul(val, &err, 0);
if (!*val || *err) {
fprintf(stderr, "bad numerical value %s\n", val);
goto error;
}
if (numvalue < 0x80000000) {
numvalue += 0x80000000;
}
x86_cpu_def->xlevel = numvalue;
} else if (!strcmp(featurestr, "vendor")) { } else if (!strcmp(featurestr, "vendor")) {
if (strlen(val) != 12) { if (strlen(val) != 12) {
fprintf(stderr, "vendor string must be 12 chars long\n"); fprintf(stderr, "vendor string must be 12 chars long\n");