[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/21] target-i386: cleanup cpu_x86_find_by_name(),
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 21/21] target-i386: cleanup cpu_x86_find_by_name(), only fill x86_def_t in it |
Date: |
Wed, 15 Aug 2012 18:13:41 +0200 |
Do in cpu_x86_find_by_name() only what name implies. i.e. leave only
cpudef search and copy/fill passed in x86_def_t structure.
and move out of it cpu_model parsing and CPU initializing into
cpu_x86_register(). Plus add hints to where blocks should go when
cpu_x86_register() is disbanded.
Signed-off-by: Igor Mammedov <address@hidden>
---
target-i386/cpu.c | 55 +++++++++++++++++++++++++++----------------------------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 75cbf48..ee2a90f 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1170,42 +1170,26 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t
*x86_cpu_def,
{
x86_def_t *def;
- QDict *features;
- char *name;
-
- compat_normalize_cpu_model(cpu_model, &name, &features, errp);
- if (error_is_set(errp)) {
- goto error;
+ if (!cpu_model) {
+ error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cpu_model", "NULL");
+ return -1;
}
- for (def = x86_defs; def; def = def->next)
- if (name && !strcmp(name, def->name))
+ for (def = x86_defs; def; def = def->next) {
+ if (!strcmp(cpu_model, def->name)) {
break;
- if (kvm_enabled() && name && strcmp(name, "host") == 0) {
+ }
+ }
+ if (kvm_enabled() && strcmp(cpu_model, "host") == 0) {
cpu_x86_fill_host(x86_cpu_def);
} else if (!def) {
- goto error;
+ error_set(errp, QERR_DEVICE_NOT_FOUND, cpu_model);
+ return -1;
} else {
memcpy(x86_cpu_def, def, sizeof(*def));
}
- cpudef_2_x86_cpu(cpu, x86_cpu_def, errp);
-
- cpu_x86_set_props(cpu, features, errp);
- QDECREF(features);
- if (error_is_set(errp)) {
- goto error;
- }
-
- g_free(name);
return 0;
-
-error:
- g_free(name);
- if (!error_is_set(errp)) {
- error_set(errp, QERR_INVALID_PARAMETER_COMBINATION);
- }
- return -1;
}
/* generate a composite string into buf of all cpuid names in featureset
@@ -1326,14 +1310,29 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
{
x86_def_t def1, *def = &def1;
Error *error = NULL;
+ QDict *features;
+ char *name;
- memset(def, 0, sizeof(*def));
+ /* for CPU subclasses should go into cpu_x86_init() before object_new() */
+ compat_normalize_cpu_model(cpu_model, &name, &features, &error);
+ if (error_is_set(&error)) {
+ goto out;
+ }
- if (cpu_x86_find_by_name(cpu, def, cpu_model, &error) < 0) {
+ /* this block should be replaced by CPU subclasses */
+ memset(def, 0, sizeof(*def));
+ if (cpu_x86_find_by_name(cpu, def, name, &error) < 0) {
goto out;
}
+ cpudef_2_x86_cpu(cpu, def, &error);
+
+ /* for CPU subclasses should go between object_new() and
+ * x86_cpu_realize() */
+ cpu_x86_set_props(cpu, features, &error);
out:
+ QDECREF(features);
+ g_free(name);
if (error_is_set(&error)) {
fprintf(stderr, "%s\n", error_get_pretty(error));
error_free(error);
--
1.7.11.2
- [Qemu-devel] [PATCH 15/21] target-i386: use define for cpuid vendor string size, (continued)
- [Qemu-devel] [PATCH 15/21] target-i386: use define for cpuid vendor string size, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 13/21] target-i386: use visit_type_hz to parse tsc_freq property value, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 05/21] target-i386: move out CPU features initialization in separate func, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 16/21] target-i386: replace uint32_t vendor fields by vendor string in x86_def_t, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 19/21] target-i386: move init of "hypervisor" feature into CPU initializer from cpudef, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 20/21] target-i386: move default init of cpuid_kvm_features bitmap into CPU initializer from cpudef, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 12/21] add visitor for parsing hz[KMG] input string, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 18/21] target-i386: use properties to set/unset user specified features on CPU, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 21/21] target-i386: cleanup cpu_x86_find_by_name(), only fill x86_def_t in it,
Igor Mammedov <=
- [Qemu-devel] [PATCH 09/21] target-i386: convert 'hv_relaxed' feature into property, Igor Mammedov, 2012/08/15
- [Qemu-devel] [PATCH 17/21] target-i386: parse cpu_model string into set of stringified properties, Igor Mammedov, 2012/08/15
- Re: [Qemu-devel] [PATCH 00/21] target-i386: convert CPU features into properties, Eduardo Habkost, 2012/08/15