From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0g0-0001Tu-4h for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:27:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI0ft-0006e4-Ae for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:27:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0ft-0006dl-3L for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:27:01 -0400 From: Eduardo Habkost Date: Thu, 14 Aug 2014 16:25:43 -0300 Message-Id: <1408044362-11621-15-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 14/33] piix: Eliminate pc_i440fx_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 i440fx class_init function, just register a common parent class for all i440fx machine-types. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 55 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5688b10..75c05bb 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -452,15 +452,25 @@ static void pc_xen_hvm_init(MachineState *machine) } #endif -static void pc_i440fx_machine_options(MachineClass *mc) +static void pc_i440fx_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Standard PC (i440FX + PIIX, 1996)"; mc->hot_add_cpu = pc_hot_add_cpu; } +#define TYPE_PC_I440FX_MACHINE "pc-i440fx" TYPE_MACHINE_SUFFIX + +static TypeInfo pc_i440fx_machine_type_info = { + .name = TYPE_PC_I440FX_MACHINE, + .parent = TYPE_PC_MACHINE, + .class_init = pc_i440fx_machine_class_init, + .abstract = true, +}; + + static void pc_i440fx_2_1_machine_options(MachineClass *mc) { - pc_i440fx_machine_options(mc); mc->default_machine_opts = "firmware=bios-256k.bin"; } @@ -476,7 +486,7 @@ static void pc_i440fx_machine_v2_1_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_i440fx_machine_v2_1_type_info = { .name = "pc-i440fx-2.1" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_i440fx_machine_v2_1_class_init, }; @@ -497,12 +507,10 @@ static void pc_i440fx_machine_v2_0_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_i440fx_machine_v2_0_type_info = { .name = "pc-i440fx-2.0" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_i440fx_machine_v2_0_class_init, }; -#define pc_i440fx_1_7_machine_options pc_i440fx_machine_options - static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -510,7 +518,6 @@ static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data) PC_COMPAT_1_7, { /* end of list */ } }; - pc_i440fx_1_7_machine_options(mc); mc->init = pc_init_pci_1_7; mc->name = "pc-i440fx-1.7"; machine_class_add_compat_props(mc, compat_props); @@ -518,12 +525,10 @@ static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_i440fx_machine_v1_7_type_info = { .name = "pc-i440fx-1.7" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_i440fx_machine_v1_7_class_init, }; -#define pc_i440fx_1_6_machine_options pc_i440fx_machine_options - static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -531,7 +536,6 @@ static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *data) PC_COMPAT_1_6, { /* end of list */ } }; - pc_i440fx_1_6_machine_options(mc); mc->init = pc_init_pci_1_6; mc->name = "pc-i440fx-1.6"; machine_class_add_compat_props(mc, compat_props); @@ -539,7 +543,7 @@ static void pc_i440fx_machine_v1_6_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_i440fx_machine_v1_6_type_info = { .name = "pc-i440fx-1.6" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_i440fx_machine_v1_6_class_init, }; @@ -550,7 +554,6 @@ static void pc_i440fx_machine_v1_5_class_init(ObjectClass *oc, void *data) PC_COMPAT_1_5, { /* end of list */ } }; - pc_i440fx_1_6_machine_options(mc); mc->init = pc_init_pci_1_5; mc->name = "pc-i440fx-1.5"; machine_class_add_compat_props(mc, compat_props); @@ -558,13 +561,12 @@ static void pc_i440fx_machine_v1_5_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_i440fx_machine_v1_5_type_info = { .name = "pc-i440fx-1.5" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_i440fx_machine_v1_5_class_init, }; static void pc_i440fx_1_4_machine_options(MachineClass *mc) { - pc_i440fx_1_6_machine_options(mc); mc->hot_add_cpu = NULL; } @@ -583,7 +585,7 @@ static void pc_i440fx_machine_v1_4_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_i440fx_machine_v1_4_type_info = { .name = "pc-i440fx-1.4" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_i440fx_machine_v1_4_class_init, }; @@ -622,7 +624,7 @@ static void pc_machine_v1_3_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v1_3_type_info = { .name = "pc-1.3" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v1_3_class_init, }; @@ -674,7 +676,7 @@ static void pc_machine_v1_2_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v1_2_type_info = { .name = "pc-1.2" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v1_2_class_init, }; @@ -724,7 +726,7 @@ static void pc_machine_v1_1_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v1_1_type_info = { .name = "pc-1.1" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v1_1_class_init, }; @@ -763,7 +765,7 @@ static void pc_machine_v1_0_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v1_0_type_info = { .name = "pc-1.0" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v1_0_class_init, }; @@ -785,7 +787,7 @@ static void pc_machine_v0_15_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v0_15_type_info = { .name = "pc-0.15" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v0_15_class_init, }; @@ -832,7 +834,7 @@ static void pc_machine_v0_14_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v0_14_type_info = { .name = "pc-0.14" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v0_14_class_init, }; @@ -881,7 +883,7 @@ static void pc_machine_v0_13_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v0_13_type_info = { .name = "pc-0.13" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v0_13_class_init, }; @@ -924,7 +926,7 @@ static void pc_machine_v0_12_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v0_12_type_info = { .name = "pc-0.12" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v0_12_class_init, }; @@ -963,7 +965,7 @@ static void pc_machine_v0_11_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v0_11_type_info = { .name = "pc-0.11" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v0_11_class_init, }; @@ -1003,7 +1005,7 @@ static void pc_machine_v0_10_class_init(ObjectClass *oc, void *data) static const TypeInfo pc_machine_v0_10_type_info = { .name = "pc-0.10" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_I440FX_MACHINE, .class_init = pc_machine_v0_10_class_init, }; @@ -1060,6 +1062,7 @@ static const TypeInfo xenfv_machine_type_info = { static void pc_machine_init(void) { + type_register_static(&pc_i440fx_machine_type_info); type_register_static(&pc_i440fx_machine_v2_1_type_info); type_register_static(&pc_i440fx_machine_v2_0_type_info); type_register_static(&pc_i440fx_machine_v1_7_type_info); -- 1.9.3