From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DH-0004qm-Kd for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sx8DC-00069X-At for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DC-00068U-21 for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:02 -0400 From: Eduardo Habkost Date: Thu, 2 Aug 2012 23:59:26 -0300 Message-Id: <1343962766-22024-20-git-send-email-ehabkost@redhat.com> In-Reply-To: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> References: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 19/19] HACK: late CPU class initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 --- 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