[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/20] target-i386: cpu_x86_register() consolidate f
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 07/20] target-i386: cpu_x86_register() consolidate freeing resources |
Date: |
Fri, 28 Dec 2012 21:01:22 +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>
Reviewed-by: Eduardo Habkost <address@hidden>
---
v2:
- add missing 'return -1' on exit if error is not NULL,
Spotted-By: Eduardo Habkost <address@hidden>
v3:
- set error if cpu_model is empty
---
target-i386/cpu.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 3b9bbfe..97cce89 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1550,13 +1550,15 @@ 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;
@@ -1566,22 +1568,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 00/20 v4] x86 CPU cleanup (wave 2), Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 02/20] target-i386: sanitize AMD's ext2_features at realize time, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 01/20] target-i386: filter out unsupported features at realize time, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 04/20] target-i386: setting default 'vendor' is obsolete, remove it, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 03/20] target-i386: explicitly set vendor for each built-in cpudef, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 06/20] target-i386: move out CPU features initialization in separate func, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 08/20] target-i386: move kvm_check_features_against_host() check to realize time, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 05/20] target-i386: move setting defaults out of cpu_x86_parse_featurestr(), Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 07/20] target-i386: cpu_x86_register() consolidate freeing resources,
Igor Mammedov <=
- [Qemu-devel] [PATCH 12/20] target-i386: prepare cpu_x86_parse_featurestr() to return a set of key, value property pairs, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 09/20] target-i386: add x86cpu_vendor_words2str(), Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 13/20] target-i386: set custom 'vendor' without intermediate x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 16/20] target-i386: set custom 'level' without intermediate x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 10/20] target-i386: replace uint32_t vendor fields by vendor string in x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 15/20] target-i386: set custom 'xlevel' without intermediate x86_def_t, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 11/20] target-i386: remove vendor_override field from CPUX86State, Igor Mammedov, 2012/12/28
- [Qemu-devel] [PATCH 14/20] target-i386: print deprecated warning if xlevel < 0x80000000, Igor Mammedov, 2012/12/28