[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/20 v2] target-i386: cpu_x86_register() consolidat
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 07/20 v2] target-i386: cpu_x86_register() consolidate freeing resources |
Date: |
Tue, 18 Dec 2012 17:30:43 +0100 |
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 <address@hidden>
---
v2:
- add missing 'return -1' on exit if error is not NULL,
Spotted-By: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 3b9bbfe..fe8b76c 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1550,13 +1550,14 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
model_pieces = g_strsplit(cpu_model, ",", 2);
if (!model_pieces[0]) {
- goto error;
+ 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;
@@ -1566,22 +1567,20 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
&def->svm_features, &def->cpuid_7_0_ebx_features);
if (cpu_x86_parse_featurestr(def, features) < 0) {
- goto error;
+ error_setg(&error, "Invalid cpu_model string format: %s", cpu_model);
+ goto out;
}
cpudef_2_x86_cpu(cpu, def, &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
[Qemu-devel] [PATCH 08/20] target-i386: compile kvm only functions if CONFIG_KVM is defined, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 14/20] target-i386: set custom 'vendor' without intermediate x86_def_t, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 09/20] target-i386: move kvm_check_features_against_host() check to realize time, Igor Mammedov, 2012/12/17