[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 19/19] HACK: late CPU class initialization
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 19/19] HACK: late CPU class initialization |
Date: |
Thu, 2 Aug 2012 23:59:26 -0300 |
This is just a hack to make the experimental CPU class code work without
removing the cpudef support.
After we remove the cpudef support, we can simply use type_init() again,
and register only the builtin CPU models as CPU classes.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index df4fb1f..8e978bd 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1575,6 +1575,8 @@ void cpu_clear_apic_feature(CPUX86State *env)
#endif /* !CONFIG_USER_ONLY */
+static void x86_cpu_register_types(void);
+
/* register "cpudef" models defined in configuration file. Here we first
* preload any built-in definitions
*/
@@ -1605,6 +1607,8 @@ void x86_cpudef_setup(void)
#if !defined(CONFIG_USER_ONLY)
qemu_opts_foreach(qemu_find_opts("cpudef"), cpudef_register, NULL, 0);
#endif
+
+ x86_cpu_register_types();
}
static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx,
@@ -2123,4 +2127,5 @@ static void x86_cpu_register_types(void)
x86_cpu_register_class("host", &host_def);
}
-type_init(x86_cpu_register_types)
+//HACK: the function is being called from x86_cpudef_setup()
+//type_init(x86_cpu_register_types)
--
1.7.11.2
- [Qemu-devel] [RFC 00/19] i386 CPU code cleanup + CPU model classes, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 14/19] extract CPU object field initialization from cpu_x86_register(), Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 15/19] cpu_x86_create: move error handling to end of function, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 02/19] x86_cpudef_setup: coding style change, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 09/19] i386: reorder object setup on cpu_x86_init(), Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 16/19] kill cpu_x86_register(), Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 17/19] kill cpu_x86_build_from_name(), Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 19/19] HACK: late CPU class initialization,
Eduardo Habkost <=
- [Qemu-devel] [RFC 05/19] cpu_x86_build_from_name: use strtok_r(), Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 13/19] move X86CPUDefinition to cpu-qom.h, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 01/19] target-i386/cpu.c: coding style fixes, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 18/19] register a class for each CPU model, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 08/19] i386: extract CPU model lookup to a separate function, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 07/19] i386: cpu: extract parsing of feature strings to separate function, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 10/19] move CPU object creation to cpu.c, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 03/19] i386: x86_def_t: rename 'flags' field, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 11/19] rename x86_def_t to X86CPUDefinition, Eduardo Habkost, 2012/08/02
- [Qemu-devel] [RFC 06/19] i386: cpu: extract the full feature list before parsing it, Eduardo Habkost, 2012/08/02