From nobody Sat Sep 6 00:47:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751496019897999.6505831137241; Wed, 2 Jul 2025 15:40:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uX65w-0008Ld-SA; Wed, 02 Jul 2025 18:38:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uX65s-0008He-Cu; Wed, 02 Jul 2025 18:38:20 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uX65q-0005GK-NQ; Wed, 02 Jul 2025 18:38:20 -0400 Received: from zero.eik.bme.hu (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 1E6DD55CCA9; Thu, 03 Jul 2025 00:38:16 +0200 (CEST) Received: from zero.eik.bme.hu ([127.0.0.1]) by zero.eik.bme.hu (zero.eik.bme.hu [127.0.0.1]) (amavisd-new, port 10028) with ESMTP id uy_zViouyS2M; Thu, 3 Jul 2025 00:38:14 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 23BC855CB6F; Thu, 03 Jul 2025 00:38:14 +0200 (CEST) X-Virus-Scanned: amavisd-new at eik.bme.hu Message-ID: <3c2aa5b895adbb5244b643a6672603d65dce4298.1751494995.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 11/13] hw/boards: Extend DEFINE_MACHINE macro to cover more use cases MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Nicholas Piggin Date: Thu, 03 Jul 2025 00:38:14 +0200 (CEST) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1751496021443116600 Content-Type: text/plain; charset="utf-8" Add a more general DEFINE_MACHINE_EXTENDED macro and define simpler versions with less parameters based on that. This is inspired by how the OBJECT_DEFINE macros do this in a similar way to allow using the shortened definition in more complex cases too. Signed-off-by: BALATON Zoltan --- include/hw/boards.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index f424b2b505..8e8eff2f6d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -761,7 +761,8 @@ struct MachineState { } \ } while (0) =20 -#define DEFINE_MACHINE(namestr, machine_initfn) \ +#define DEFINE_MACHINE_EXTENDED(namestr, PARENT_NAME, InstanceName, \ + machine_initfn, ABSTRACT, ...) \ static void machine_initfn##_class_init(ObjectClass *oc, const void *d= ata) \ { \ MachineClass *mc =3D MACHINE_CLASS(oc); \ @@ -769,8 +770,11 @@ struct MachineState { } \ static const TypeInfo machine_initfn##_typeinfo =3D { \ .name =3D MACHINE_TYPE_NAME(namestr), \ - .parent =3D TYPE_MACHINE, \ + .parent =3D TYPE_##PARENT_NAME, \ .class_init =3D machine_initfn##_class_init, \ + .instance_size =3D sizeof(InstanceName), \ + .abstract =3D ABSTRACT, \ + .interfaces =3D (const InterfaceInfo[]) { __VA_ARGS__ } , \ }; \ static void machine_initfn##_register_types(void) \ { \ @@ -778,6 +782,14 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) =20 +#define DEFINE_MACHINE(namestr, machine_initfn) \ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, { }) + +#define DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, ...) \ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn= , \ + false, __VA_ARGS__) + extern GlobalProperty hw_compat_10_0[]; extern const size_t hw_compat_10_0_len; =20 --=20 2.41.3