From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5mZ0-00062t-BU for qemu-devel@nongnu.org; Sun, 06 Dec 2015 22:34:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a5mYz-0006Je-7f for qemu-devel@nongnu.org; Sun, 06 Dec 2015 22:34:10 -0500 From: David Gibson Date: Mon, 7 Dec 2015 14:34:36 +1100 Message-Id: <1449459280-14983-7-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au> References: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCHv2 06/10] pseries: Use SET_MACHINE_COMPAT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: ehabkost@redhat.com, agraf@suse.de, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson To make the spapr_machine_*_class_init() functions a little less bulky. Signed-off-by: David Gibson --- hw/ppc/spapr.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b08d338..3078e60 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2329,13 +2329,9 @@ static const TypeInfo spapr_machine_2_5_info = { static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) { - static GlobalProperty compat_props[] = { - SPAPR_COMPAT_2_4 - { /* end of list */ } - }; MachineClass *mc = MACHINE_CLASS(oc); - mc->compat_props = compat_props; + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_4); } static const TypeInfo spapr_machine_2_4_info = { @@ -2369,13 +2365,9 @@ static void spapr_machine_2_3_instance_init(Object *obj) static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data) { - static GlobalProperty compat_props[] = { - SPAPR_COMPAT_2_3 - { /* end of list */ } - }; MachineClass *mc = MACHINE_CLASS(oc); - mc->compat_props = compat_props; + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_3); } static const TypeInfo spapr_machine_2_3_info = { @@ -2410,13 +2402,9 @@ static void spapr_machine_2_2_instance_init(Object *obj) static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data) { - static GlobalProperty compat_props[] = { - SPAPR_COMPAT_2_2 - { /* end of list */ } - }; MachineClass *mc = MACHINE_CLASS(oc); - mc->compat_props = compat_props; + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_2); } static const TypeInfo spapr_machine_2_2_info = { @@ -2446,12 +2434,8 @@ static void spapr_machine_2_1_instance_init(Object *obj) static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); - static GlobalProperty compat_props[] = { - SPAPR_COMPAT_2_1 - { /* end of list */ } - }; - mc->compat_props = compat_props; + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_1); } static const TypeInfo spapr_machine_2_1_info = { -- 2.5.0