[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/37] target-i386: return Error from cpu_x86_find_b
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 01/37] target-i386: return Error from cpu_x86_find_by_name() |
Date: |
Mon, 22 Oct 2012 17:02:47 +0200 |
it will allow to use property setters there later.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Don Slutz <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
--
v2:
- style change, add braces (requested by Blue Swirl)
- removed unused error_is_set(errp) in properties set loop
v3:
- removed unnecessary whitespace change
---
target-i386/cpu.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index f3708e6..ab2d462 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1097,7 +1097,8 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor
*v, void *opaque,
cpu->env.tsc_khz = value / 1000;
}
-static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
+static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def,
+ const char *cpu_model, Error **errp)
{
unsigned int i;
x86_def_t *def;
@@ -1282,6 +1283,9 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def,
const char *cpu_model)
error:
g_free(s);
+ if (!error_is_set(errp)) {
+ error_set(errp, QERR_INVALID_PARAMETER_COMBINATION);
+ }
return -1;
}
@@ -1368,8 +1372,10 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
memset(def, 0, sizeof(*def));
- if (cpu_x86_find_by_name(def, cpu_model) < 0)
- return -1;
+ if (cpu_x86_find_by_name(cpu, def, cpu_model, &error) < 0) {
+ goto out;
+ }
+
if (def->vendor1) {
env->cpuid_vendor1 = def->vendor1;
env->cpuid_vendor2 = def->vendor2;
@@ -1419,6 +1425,8 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
env->cpuid_svm_features &= TCG_SVM_FEATURES;
}
object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);
+
+out:
if (error_is_set(&error)) {
error_free(error);
return -1;
--
1.7.11.7
- [Qemu-devel] [PATCH 00/37 v5] target-i386: convert CPU features into properties, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 04/37] target-i386: filter out not TCG features if running without kvm at realize time, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 07/37] target-i386: use visit_type_hz to parse tsc_freq property value, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 02/37] target-i386: cpu_x86_register(): report error from property setter, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 10/37] target-i386: parse cpu_model string into set of stringified properties, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 01/37] target-i386: return Error from cpu_x86_find_by_name(),
Igor Mammedov <=
- [Qemu-devel] [PATCH 03/37] target-i386: if x86_cpu_realize() failed report error and do cleanup, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 13/37] target-i386: convert "level" to static property, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 06/37] add visitor for parsing hz[KMG] input string, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 14/37] target-i386: postpone cpuid_level update to realize time, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 08/37] target-i386: define static properties for cpuid features, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 21/37] target-i386: convert 'hv_relaxed' to static property, Igor Mammedov, 2012/10/22
- [Qemu-devel] [PATCH 11/37] target-i386: introduce vendor-override static property, Igor Mammedov, 2012/10/22