From nobody Wed Feb 11 02:54:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150821537629184.4131058286232; Mon, 16 Oct 2017 21:42:56 -0700 (PDT) Received: from localhost ([::1]:36442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JiN-0000qI-SM for importer@patchew.org; Tue, 17 Oct 2017 00:42:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JOe-0008Um-Nj for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4JOb-0007Cv-St for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:28 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:40009) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4JOb-00079Q-Ht; Tue, 17 Oct 2017 00:22:25 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3yGMTy1WQCz9t5Q; Tue, 17 Oct 2017 15:22:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1508214134; bh=utJ4RwyMFt4wUYi0C1kIGtUBAJuLxWT69jCF4fpkAHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OA2tntNMTEbDdMSCVVo6pNWC3/DkTWDUeh0F7GYxqd1GMA5u5vnlaqHwrSTeovMW7 ZQQQJRo8uxK2CIe1J0Y1v3DlKNBE37RHH1QdbHMswpEF43ZycXSiPfxnsvumdOZ8vK hu9r1sEadj4TWgXsThc6Zdcb4xkXvLMepuWF0BY0= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 17 Oct 2017 15:21:49 +1100 Message-Id: <20171017042152.29443-32-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171017042152.29443-1-david@gibson.dropbear.id.au> References: <20171017042152.29443-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 31/34] ppc: pnv: consolidate type definitions and batch register them X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, ehabkost@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, imammedo@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov Use a new DEFINE_TYPES() helper to simplify type registration Signed-off-by: Igor Mammedov Reviewed-by: C=C3=A9dric Le Goater Acked-by: David Gibson Signed-off-by: David Gibson --- hw/ppc/pnv.c | 92 ++++++++++++++++++++++----------------------------------= ---- 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 80c7f62bbc..c35c439d81 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -729,13 +729,6 @@ static void pnv_chip_power8e_class_init(ObjectClass *k= lass, void *data) dc->desc =3D "PowerNV Chip POWER8E"; } =20 -static const TypeInfo pnv_chip_power8e_info =3D { - .name =3D TYPE_PNV_CHIP_POWER8E, - .parent =3D TYPE_PNV_CHIP, - .instance_size =3D sizeof(PnvChip), - .class_init =3D pnv_chip_power8e_class_init, -}; - static void pnv_chip_power8_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -750,13 +743,6 @@ static void pnv_chip_power8_class_init(ObjectClass *kl= ass, void *data) dc->desc =3D "PowerNV Chip POWER8"; } =20 -static const TypeInfo pnv_chip_power8_info =3D { - .name =3D TYPE_PNV_CHIP_POWER8, - .parent =3D TYPE_PNV_CHIP, - .instance_size =3D sizeof(PnvChip), - .class_init =3D pnv_chip_power8_class_init, -}; - static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -771,13 +757,6 @@ static void pnv_chip_power8nvl_class_init(ObjectClass = *klass, void *data) dc->desc =3D "PowerNV Chip POWER8NVL"; } =20 -static const TypeInfo pnv_chip_power8nvl_info =3D { - .name =3D TYPE_PNV_CHIP_POWER8NVL, - .parent =3D TYPE_PNV_CHIP, - .instance_size =3D sizeof(PnvChip), - .class_init =3D pnv_chip_power8nvl_class_init, -}; - static void pnv_chip_power9_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -792,13 +771,6 @@ static void pnv_chip_power9_class_init(ObjectClass *kl= ass, void *data) dc->desc =3D "PowerNV Chip POWER9"; } =20 -static const TypeInfo pnv_chip_power9_info =3D { - .name =3D TYPE_PNV_CHIP_POWER9, - .parent =3D TYPE_PNV_CHIP, - .instance_size =3D sizeof(PnvChip), - .class_init =3D pnv_chip_power9_class_init, -}; - static void pnv_chip_core_sanitize(PnvChip *chip, Error **errp) { PnvChipClass *pcc =3D PNV_CHIP_GET_CLASS(chip); @@ -1000,15 +972,6 @@ static void pnv_chip_class_init(ObjectClass *klass, v= oid *data) dc->desc =3D "PowerNV Chip"; } =20 -static const TypeInfo pnv_chip_info =3D { - .name =3D TYPE_PNV_CHIP, - .parent =3D TYPE_SYS_BUS_DEVICE, - .class_init =3D pnv_chip_class_init, - .instance_init =3D pnv_chip_init, - .class_size =3D sizeof(PnvChipClass), - .abstract =3D true, -}; - static ICSState *pnv_ics_get(XICSFabric *xi, int irq) { PnvMachineState *pnv =3D POWERNV_MACHINE(xi); @@ -1144,27 +1107,40 @@ static void powernv_machine_class_init(ObjectClass = *oc, void *data) powernv_machine_class_props_init(oc); } =20 -static const TypeInfo powernv_machine_info =3D { - .name =3D TYPE_POWERNV_MACHINE, - .parent =3D TYPE_MACHINE, - .instance_size =3D sizeof(PnvMachineState), - .instance_init =3D powernv_machine_initfn, - .class_init =3D powernv_machine_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_XICS_FABRIC }, - { TYPE_INTERRUPT_STATS_PROVIDER }, - { }, +#define DEFINE_PNV_CHIP_TYPE(type, class_initfn) \ + { \ + .name =3D type, \ + .class_init =3D class_initfn, \ + .parent =3D TYPE_PNV_CHIP, \ + } + +static const TypeInfo types[] =3D { + { + .name =3D TYPE_POWERNV_MACHINE, + .parent =3D TYPE_MACHINE, + .instance_size =3D sizeof(PnvMachineState), + .instance_init =3D powernv_machine_initfn, + .class_init =3D powernv_machine_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_XICS_FABRIC }, + { TYPE_INTERRUPT_STATS_PROVIDER }, + { }, + }, }, + { + .name =3D TYPE_PNV_CHIP, + .parent =3D TYPE_SYS_BUS_DEVICE, + .class_init =3D pnv_chip_class_init, + .instance_init =3D pnv_chip_init, + .instance_size =3D sizeof(PnvChip), + .class_size =3D sizeof(PnvChipClass), + .abstract =3D true, + }, + DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER9, pnv_chip_power9_class_init), + DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER8, pnv_chip_power8_class_init), + DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER8E, pnv_chip_power8e_class_ini= t), + DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER8NVL, + pnv_chip_power8nvl_class_init), }; =20 -static void powernv_machine_register_types(void) -{ - type_register_static(&powernv_machine_info); - type_register_static(&pnv_chip_info); - type_register_static(&pnv_chip_power8e_info); - type_register_static(&pnv_chip_power8_info); - type_register_static(&pnv_chip_power8nvl_info); - type_register_static(&pnv_chip_power9_info); -} - -type_init(powernv_machine_register_types) +DEFINE_TYPES(types) --=20 2.13.6