From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0g2-0001YI-0D for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:27:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI0fv-0006eV-SK for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:27:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fv-0006eL-K5 for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:27:03 -0400 From: Eduardo Habkost Date: Thu, 14 Aug 2014 16:25:44 -0300 Message-Id: <1408044362-11621-16-git-send-email-ehabkost@redhat.com> In-Reply-To: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> References: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v4 15/33] q35: Eliminate pc_q35_machine_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Don Slutz , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Instead of calling it on every q35 class_init function, just register a common parent class for all q35 machine-types. Signed-off-by: Eduardo Habkost --- hw/i386/pc_q35.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0074640..2aa1c43 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -341,15 +341,24 @@ static void pc_q35_init_1_4(MachineState *machine) pc_q35_init(machine); } -static void pc_q35_machine_options(MachineClass *mc) +static void pc_q35_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Standard PC (Q35 + ICH9, 2009)"; mc->hot_add_cpu = pc_hot_add_cpu; } +#define TYPE_PC_Q35_MACHINE "pc-q35" TYPE_MACHINE_SUFFIX + +static TypeInfo pc_q35_machine_type_info = { + .name = TYPE_PC_Q35_MACHINE, + .parent = TYPE_PC_MACHINE, + .class_init = pc_q35_machine_class_init, + .abstract = true, +}; + static void pc_q35_2_1_machine_options(MachineClass *mc) { - pc_q35_machine_options(mc); mc->default_machine_opts = "firmware=bios-256k.bin"; } @@ -364,7 +373,7 @@ static void pc_q35_machine_v2_1_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v2_1_type_info = { .name = "pc-q35-2.1" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v2_1_class_init, }; @@ -385,12 +394,10 @@ static void pc_q35_machine_v2_0_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v2_0_type_info = { .name = "pc-q35-2.0" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v2_0_class_init, }; -#define pc_q35_1_7_machine_options pc_q35_machine_options - static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -398,7 +405,6 @@ static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) PC_COMPAT_1_7, { /* end of list */ } }; - pc_q35_1_7_machine_options(mc); mc->init = pc_q35_init_1_7; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.7"; @@ -406,12 +412,10 @@ static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_7_type_info = { .name = "pc-q35-1.7" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_7_class_init, }; -#define pc_q35_1_6_machine_options pc_q35_machine_options - static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -419,7 +423,6 @@ static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data) PC_COMPAT_1_6, { /* end of list */ } }; - pc_q35_1_6_machine_options(mc); mc->init = pc_q35_init_1_6; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.6"; @@ -427,7 +430,7 @@ static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_6_type_info = { .name = "pc-q35-1.6" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_6_class_init, }; @@ -438,7 +441,6 @@ static void pc_q35_machine_v1_5_class_init(ObjectClass *oc, void *data) PC_COMPAT_1_5, { /* end of list */ } }; - pc_q35_1_6_machine_options(mc); mc->init = pc_q35_init_1_5; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.5"; @@ -446,13 +448,12 @@ static void pc_q35_machine_v1_5_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_5_type_info = { .name = "pc-q35-1.5" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_5_class_init, }; static void pc_q35_1_4_machine_options(MachineClass *mc) { - pc_q35_1_6_machine_options(mc); mc->hot_add_cpu = NULL; } @@ -471,12 +472,13 @@ static void pc_q35_machine_v1_4_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_4_type_info = { .name = "pc-q35-1.4" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_4_class_init, }; static void pc_q35_machine_init(void) { + type_register_static(&pc_q35_machine_type_info); type_register_static(&pc_q35_machine_v2_1_type_info); type_register_static(&pc_q35_machine_v2_0_type_info); type_register_static(&pc_q35_machine_v1_7_type_info); -- 1.9.3