From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T24XI-0006fs-J3 for qemu-devel@nongnu.org; Thu, 16 Aug 2012 14:11:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T24XH-0001PE-KB for qemu-devel@nongnu.org; Thu, 16 Aug 2012 14:11:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T24XH-0001P8-CN for qemu-devel@nongnu.org; Thu, 16 Aug 2012 14:11:11 -0400 From: Eduardo Habkost Date: Thu, 16 Aug 2012 13:59:12 -0300 Message-Id: <1345136352-10756-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1345136352-10756-1-git-send-email-ehabkost@redhat.com> References: <1345136352-10756-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 13/13] HACK to initialize types later List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, vijaymohan.pandarathil@hp.com, jan.kiszka@siemens.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de This is only a temporary hack so that this series can be tested while we don't kill the support for "cpudef" config sections. 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 4f718af..5c382f1 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1638,6 +1638,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 */ @@ -1668,6 +1670,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, @@ -2257,4 +2261,5 @@ static void x86_cpu_register_types(void) } -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