motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-15 06:01:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target-i386: Consolidate calls of object_property_parse() in x86_cpu_parse_featurestr

Browse source 
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2016-06-09 19:10:58 +02:00
parent a57d0163e7
commit f6750e959a
1 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

48
target-i386/cpu.c
View file

@ -1966,18 +1966,39 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
char *featurestr; /* Single 'key=value" string being parsed */ char *featurestr; /* Single 'key=value" string being parsed */
Error *local_err = NULL; Error *local_err = NULL;
featurestr = features ? strtok(features, ",") : NULL; if (!features) {
return;
}
while (featurestr) { for (featurestr = strtok(features, ",");
char *val; featurestr && !local_err;
featurestr = strtok(NULL, ",")) {
const char *name;
const char *val = NULL;
char *eq = NULL;
/* Compatibility syntax: */
if (featurestr[0] == '+') { if (featurestr[0] == '+') {
add_flagname_to_bitmaps(featurestr + 1, plus_features, &local_err); add_flagname_to_bitmaps(featurestr + 1, plus_features, &local_err);
continue;
} else if (featurestr[0] == '-') { } else if (featurestr[0] == '-') {
add_flagname_to_bitmaps(featurestr + 1, minus_features, &local_err); add_flagname_to_bitmaps(featurestr + 1, minus_features, &local_err);
} else if ((val = strchr(featurestr, '='))) { continue;
*val = 0; val++; }
eq = strchr(featurestr, '=');
if (eq) {
*eq++ = 0;
val = eq;
} else {
val = "on";
}
feat2prop(featurestr); feat2prop(featurestr);
if (!strcmp(featurestr, "tsc-freq")) { name = featurestr;
/* Special case: */
if (!strcmp(name, "tsc-freq")) {
int64_t tsc_freq; int64_t tsc_freq;
char *err; char *err;
char num[32]; char num[32];
@ -1989,20 +2010,15 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
return; return;
} }
snprintf(num, sizeof(num), "%" PRId64, tsc_freq); snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
object_property_parse(OBJECT(cpu), num, "tsc-frequency", val = num;
&local_err); name = "tsc-frequency";
} else {
object_property_parse(OBJECT(cpu), val, featurestr, &local_err);
} }
} else {
feat2prop(featurestr); object_property_parse(OBJECT(cpu), val, name, &local_err);
object_property_parse(OBJECT(cpu), "on", featurestr, &local_err);
} }
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return;
}
featurestr = strtok(NULL, ",");
} }
} }