From patchwork Mon Jan 11 04:37:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 565603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4435D1402F0 for ; Mon, 11 Jan 2016 15:40:57 +1100 (AEDT) Received: from localhost ([::1]:51331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUHn-0007Fc-97 for incoming@patchwork.ozlabs.org; Sun, 10 Jan 2016 23:40:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUE2-0007q1-Kp for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIUDz-0004SB-Ja for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:02 -0500 Received: from ozlabs.org ([103.22.144.67]:46584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUDz-0004QZ-6x; Sun, 10 Jan 2016 23:36:59 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id A6B79140B9A; Mon, 11 Jan 2016 15:36:50 +1100 (AEDT) From: David Gibson To: peter.maydell@linaro.org, mdroth@linux.vnet.ibm.com, aik@ozlabs.ru Date: Mon, 11 Jan 2016 15:37:32 +1100 Message-Id: <1452487058-17182-11-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> References: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: lvivier@redhat.com, thuth@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org At the moment all the class_init functions and TypeInfo structures for the various versioned pseries machine types are open-coded. As more versions are created this is getting increasingly clumsy. This patch borrows the approach used in PC, using a DEFINE_SPAPR_MACHINE() macro to construct most of the boilerplate from simpler 'class_options' and 'instance_options' functions. This patch makes a small semantic change - the versioned machine types are now registered through machine_init() instead of type_init(). Since the new way is how PC already did it, I'm assuming that's correct. Signed-off-by: David Gibson Reviewed-by: Sam Bobroff Reviewed-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 119 ++++++++++++++++++++++++--------------------------------- 1 file changed, 49 insertions(+), 70 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3078e60..4f645f3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2302,24 +2302,47 @@ static const TypeInfo spapr_machine_info = { }, }; +#define DEFINE_SPAPR_MACHINE(suffix, verstr) \ + static void spapr_machine_##suffix##_class_init(ObjectClass *oc, \ + void *data) \ + { \ + MachineClass *mc = MACHINE_CLASS(oc); \ + spapr_machine_##suffix##_class_options(mc); \ + } \ + static void spapr_machine_##suffix##_instance_init(Object *obj) \ + { \ + MachineState *machine = MACHINE(obj); \ + spapr_machine_##suffix##_instance_options(machine); \ + } \ + static const TypeInfo spapr_machine_##suffix##_info = { \ + .name = MACHINE_TYPE_NAME("pseries-" verstr), \ + .parent = TYPE_SPAPR_MACHINE, \ + .class_init = spapr_machine_##suffix##_class_init, \ + .instance_init = spapr_machine_##suffix##_instance_init, \ + }; \ + static void spapr_machine_register_##suffix(void) \ + { \ + type_register(&spapr_machine_##suffix##_info); \ + } \ + machine_init(spapr_machine_register_##suffix) + /* * pseries-2.5 */ -static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) +static void spapr_machine_2_5_instance_options(MachineState *machine) { - MachineClass *mc = MACHINE_CLASS(oc); - sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); +} + +static void spapr_machine_2_5_class_options(MachineClass *mc) +{ + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); mc->alias = "pseries"; mc->is_default = 1; smc->dr_lmb_enabled = true; } -static const TypeInfo spapr_machine_2_5_info = { - .name = MACHINE_TYPE_NAME("pseries-2.5"), - .parent = TYPE_SPAPR_MACHINE, - .class_init = spapr_machine_2_5_class_init, -}; +DEFINE_SPAPR_MACHINE(2_5, "2.5"); /* * pseries-2.4 @@ -2327,18 +2350,17 @@ static const TypeInfo spapr_machine_2_5_info = { #define SPAPR_COMPAT_2_4 \ HW_COMPAT_2_4 -static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) +static void spapr_machine_2_4_instance_options(MachineState *machine) { - MachineClass *mc = MACHINE_CLASS(oc); + spapr_machine_2_5_instance_options(machine); +} +static void spapr_machine_2_4_class_options(MachineClass *mc) +{ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_4); } -static const TypeInfo spapr_machine_2_4_info = { - .name = MACHINE_TYPE_NAME("pseries-2.4"), - .parent = TYPE_SPAPR_MACHINE, - .class_init = spapr_machine_2_4_class_init, -}; +DEFINE_SPAPR_MACHINE(2_4, "2.4"); /* * pseries-2.3 @@ -2352,30 +2374,18 @@ static const TypeInfo spapr_machine_2_4_info = { .value = "off",\ }, -static void spapr_compat_2_3(Object *obj) +static void spapr_machine_2_3_instance_options(MachineState *machine) { + spapr_machine_2_4_instance_options(machine); savevm_skip_section_footers(); global_state_set_optional(); } -static void spapr_machine_2_3_instance_init(Object *obj) -{ - spapr_compat_2_3(obj); -} - -static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data) +static void spapr_machine_2_3_class_options(MachineClass *mc) { - MachineClass *mc = MACHINE_CLASS(oc); - SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_3); } - -static const TypeInfo spapr_machine_2_3_info = { - .name = MACHINE_TYPE_NAME("pseries-2.3"), - .parent = TYPE_SPAPR_MACHINE, - .class_init = spapr_machine_2_3_class_init, - .instance_init = spapr_machine_2_3_instance_init, -}; +DEFINE_SPAPR_MACHINE(2_3, "2.3"); /* * pseries-2.2 @@ -2390,29 +2400,16 @@ static const TypeInfo spapr_machine_2_3_info = { .value = "0x20000000",\ }, -static void spapr_compat_2_2(Object *obj) -{ - spapr_compat_2_3(obj); -} - -static void spapr_machine_2_2_instance_init(Object *obj) +static void spapr_machine_2_2_instance_options(MachineState *machine) { - spapr_compat_2_2(obj); + spapr_machine_2_3_instance_options(machine); } -static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data) +static void spapr_machine_2_2_class_options(MachineClass *mc) { - MachineClass *mc = MACHINE_CLASS(oc); - SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_2); } - -static const TypeInfo spapr_machine_2_2_info = { - .name = MACHINE_TYPE_NAME("pseries-2.2"), - .parent = TYPE_SPAPR_MACHINE, - .class_init = spapr_machine_2_2_class_init, - .instance_init = spapr_machine_2_2_instance_init, -}; +DEFINE_SPAPR_MACHINE(2_2, "2.2"); /* * pseries-2.1 @@ -2421,38 +2418,20 @@ static const TypeInfo spapr_machine_2_2_info = { SPAPR_COMPAT_2_2 \ HW_COMPAT_2_1 -static void spapr_compat_2_1(Object *obj) -{ - spapr_compat_2_2(obj); -} - -static void spapr_machine_2_1_instance_init(Object *obj) +static void spapr_machine_2_1_instance_options(MachineState *machine) { - spapr_compat_2_1(obj); + spapr_machine_2_2_instance_options(machine); } -static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data) +static void spapr_machine_2_1_class_options(MachineClass *mc) { - MachineClass *mc = MACHINE_CLASS(oc); - SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_1); } - -static const TypeInfo spapr_machine_2_1_info = { - .name = MACHINE_TYPE_NAME("pseries-2.1"), - .parent = TYPE_SPAPR_MACHINE, - .class_init = spapr_machine_2_1_class_init, - .instance_init = spapr_machine_2_1_instance_init, -}; +DEFINE_SPAPR_MACHINE(2_1, "2.1"); static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); - type_register_static(&spapr_machine_2_1_info); - type_register_static(&spapr_machine_2_2_info); - type_register_static(&spapr_machine_2_3_info); - type_register_static(&spapr_machine_2_4_info); - type_register_static(&spapr_machine_2_5_info); } type_init(spapr_machine_register_types)