| Message ID | 1356620376-23501-21-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Dec 27, 2012 at 03:59:36PM +0100, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 8 +------- > 1 files changed, 1 insertions(+), 7 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 8c65012..fd53b41 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1295,13 +1295,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, > } else if ((val = strchr(featurestr, '='))) { > *val = 0; val++; > if (!strcmp(featurestr, "family")) { > - char *err; > - numvalue = strtoul(val, &err, 0); > - if (!*val || *err || numvalue > 0xff + 0xf) { > - fprintf(stderr, "bad numerical value %s\n", val); > - goto error; > - } > - x86_cpu_def->family = numvalue; > + qdict_put(*props, featurestr, qstring_from_str(val)); > } else if (!strcmp(featurestr, "model")) { > qdict_put(*props, featurestr, qstring_from_str(val)); > } else if (!strcmp(featurestr, "stepping")) { > -- > 1.7.1 >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 8c65012..fd53b41 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1295,13 +1295,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, } else if ((val = strchr(featurestr, '='))) { *val = 0; val++; if (!strcmp(featurestr, "family")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err || numvalue > 0xff + 0xf) { - fprintf(stderr, "bad numerical value %s\n", val); - goto error; - } - x86_cpu_def->family = numvalue; + qdict_put(*props, featurestr, qstring_from_str(val)); } else if (!strcmp(featurestr, "model")) { qdict_put(*props, featurestr, qstring_from_str(val)); } else if (!strcmp(featurestr, "stepping")) {
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- target-i386/cpu.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)