| Message ID | 1357870231-26762-3-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 11, 2013 at 03:10:16AM +0100, Igor Mammedov wrote: > freeing resources in one place would require setting 'error' > to not NULL, so add some more error reporting before jumping to > exit branch. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> To confirm that this rebase looks good to me: Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > v4: > - rebased with "target-i386: move out CPU features > initialization in separate func" dropped > > v3: > - set error if cpu_model is empty > > v2: > - add missing 'return -1' on exit if error is not NULL, > Spotted-By: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 19 ++++++++++--------- > 1 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 0f7a5eb..ea68bc0 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1594,20 +1594,23 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > > model_pieces = g_strsplit(cpu_model, ",", 2); > if (!model_pieces[0]) { > - goto error; > + error_setg(&error, "Invalid/empty CPU model name"); > + goto out; > } > name = model_pieces[0]; > features = model_pieces[1]; > > if (cpu_x86_find_by_name(def, name) < 0) { > - goto error; > + error_setg(&error, "Unable to find CPU definition: %s", name); > + goto out; > } > > def->kvm_features |= kvm_default_features; > def->ext_features |= CPUID_EXT_HYPERVISOR; > > if (cpu_x86_parse_featurestr(def, features) < 0) { > - goto error; > + error_setg(&error, "Invalid cpu_model string format: %s", cpu_model); > + goto out; > } > assert(def->vendor1); > env->cpuid_vendor1 = def->vendor1; > @@ -1632,17 +1635,15 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > "tsc-frequency", &error); > > object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); > + > +out: > + g_strfreev(model_pieces); > if (error) { > fprintf(stderr, "%s\n", error_get_pretty(error)); > error_free(error); > - goto error; > + return -1; > } > - > - g_strfreev(model_pieces); > return 0; > -error: > - g_strfreev(model_pieces); > - return -1; > } > > #if !defined(CONFIG_USER_ONLY) > -- > 1.7.1 >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0f7a5eb..ea68bc0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1594,20 +1594,23 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) model_pieces = g_strsplit(cpu_model, ",", 2); if (!model_pieces[0]) { - goto error; + error_setg(&error, "Invalid/empty CPU model name"); + goto out; } name = model_pieces[0]; features = model_pieces[1]; if (cpu_x86_find_by_name(def, name) < 0) { - goto error; + error_setg(&error, "Unable to find CPU definition: %s", name); + goto out; } def->kvm_features |= kvm_default_features; def->ext_features |= CPUID_EXT_HYPERVISOR; if (cpu_x86_parse_featurestr(def, features) < 0) { - goto error; + error_setg(&error, "Invalid cpu_model string format: %s", cpu_model); + goto out; } assert(def->vendor1); env->cpuid_vendor1 = def->vendor1; @@ -1632,17 +1635,15 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) "tsc-frequency", &error); object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); + +out: + g_strfreev(model_pieces); if (error) { fprintf(stderr, "%s\n", error_get_pretty(error)); error_free(error); - goto error; + return -1; } - - g_strfreev(model_pieces); return 0; -error: - g_strfreev(model_pieces); - return -1; } #if !defined(CONFIG_USER_ONLY)