Received: from eggs.gnu.org ([2001:4830:134:3::10]:48525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSCn2-00076x-1M for qemu-devel@nongnu.org; Wed, 19 Aug 2015 19:29:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSCmy-0006Tn-P9 for qemu-devel@nongnu.org; Wed, 19 Aug 2015 19:29:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSCmy-0006SF-Jy for qemu-devel@nongnu.org; Wed, 19 Aug 2015 19:29:00 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 4092936B1C1 for ; Wed, 19 Aug 2015 23:28:59 +0000 (UTC) Date: Wed, 19 Aug 2015 16:28:58 -0700 From: Eduardo Habkost Message-ID: <20150819232858.GD32203@thinpad.lan.raisama.net> References: <1439924934-30491-1-git-send-email-ehabkost@redhat.com> <1439924934-30491-6-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1439924934-30491-6-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH 5/7] pc: Use DEFINE_MACHINE to implement DEFINE_PC_MACHINE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum On Tue, Aug 18, 2015 at 12:08:52PM -0700, Eduardo Habkost wrote: > DEFINE_PC_MACHINE should be eventually replaced by DEFINE_MACHINE, we > just need to eliminate the pc_compat_*() functions first. > > Signed-off-by: Eduardo Habkost > --- > include/hw/i386/pc.h | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index d0cad87..dc22608 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -694,23 +694,12 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); > }, > > #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ > - static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ > + static void pc_machine_##suffix##_class_init(MachineClass *mc) \ > { \ > - MachineClass *mc = MACHINE_CLASS(oc); \ > optsfn(mc); \ > - mc->name = namestr; \ > mc->init = initfn; \ > } \ > - static const TypeInfo pc_machine_type_##suffix = { \ > - .name = namestr TYPE_MACHINE_SUFFIX, \ > - .parent = TYPE_PC_MACHINE, \ > - .class_init = pc_machine_##suffix##_class_init, \ > - }; \ > - static void pc_machine_init_##suffix(void) \ > - { \ > - type_register(&pc_machine_type_##suffix); \ > - } \ > - machine_init(pc_machine_init_##suffix) > + DEFINE_MACHINE(namestr, pc_machine_##suffix##_class_init) Please drop this patch, it is broken: $ ./x86_64-softmmu/qemu-system-x86_64 -machine '?' qemu/hw/i386/pc_piix.c:502:pc_i440fx_1_6_machine_options: Object 0x555563d0adb0 is not an instance of type generic-pc-machine Aborted (core dumped) The parent class is being incorrectly changed from TYPE_PC_MACHINE to TYPE_MACHINE. -- Eduardo