| Message ID | 1356724895-24118-16-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Dec 28, 2012 at 09:01:30PM +0100, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > v2: > use qstring_append_int() for converting xlevel to string > Suggested-By: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 02ece1e..14f434b 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1329,6 +1329,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, > x86_cpu_def->level = numvalue; > } else if (!strcmp(featurestr, "xlevel")) { > char *err; > + QString *s; > numvalue = strtoul(val, &err, 0); > if (!*val || *err) { > fprintf(stderr, "bad numerical value %s\n", val); > @@ -1339,7 +1340,9 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, > ", fixup will be deprecated in future versions\n"); > numvalue += 0x80000000; > } > - x86_cpu_def->xlevel = numvalue; > + s = qstring_new(); > + qstring_append_int(s, numvalue); > + qdict_put(*props, featurestr, s); > } else if (!strcmp(featurestr, "vendor")) { > qdict_put(*props, featurestr, qstring_from_str(val)); > } else if (!strcmp(featurestr, "model_id")) { > -- > 1.7.1 >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 02ece1e..14f434b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1329,6 +1329,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, x86_cpu_def->level = numvalue; } else if (!strcmp(featurestr, "xlevel")) { char *err; + QString *s; numvalue = strtoul(val, &err, 0); if (!*val || *err) { fprintf(stderr, "bad numerical value %s\n", val); @@ -1339,7 +1340,9 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, ", fixup will be deprecated in future versions\n"); numvalue += 0x80000000; } - x86_cpu_def->xlevel = numvalue; + s = qstring_new(); + qstring_append_int(s, numvalue); + qdict_put(*props, featurestr, s); } else if (!strcmp(featurestr, "vendor")) { qdict_put(*props, featurestr, qstring_from_str(val)); } else if (!strcmp(featurestr, "model_id")) {
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v2: use qstring_append_int() for converting xlevel to string Suggested-By: Eduardo Habkost <ehabkost@redhat.com> --- target-i386/cpu.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)