openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target-i386: cpu_x86_register() consolidate freeing resources 

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>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2013-01-11 03:10:16 +01:00 committed by Andreas Färber
parent 077c68c328
commit fa2db3c494
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target-i386/cpu.c
View File

@ -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,18 +1635,16 @@ 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;
}
g_strfreev(model_pieces);
return 0;
error:
g_strfreev(model_pieces);
return -1;
}
return 0;
}
#if !defined(CONFIG_USER_ONLY)