From nobody Tue Feb 10 02:48:57 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598384398; cv=none; d=zohomail.com; s=zohoarc; b=OiWTkfaVdmtfCUUOBI6sEYOZrdrcpuZZcI4kViV/0ITLiLb2FxFUMXSesAKRpr8kJs2QwjMhPpCqrOurAy1687axZoHGT8IUStPA9Tvqu672MCTox0UBkxcwyUTp5ZqDDty/4UEXUtLGpck5cnDB+BcilHdbt/Ql+XyvIBQNvxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598384398; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A0GQIvreJFv18GeOHvceQ5h3iH7RI9UkG3JIRgmwiK4=; b=Pmf/ME9d5YnYMZfANPbFoZt67gs1f3qNQc328UaoLKWfdFo4awhjBQiRlz7K446ekYYSOULWbsdr11nRyixIYfLWMR3sd1z8sYwXrPZBcVV856p2kSYxTFx3gQgib0HN1oDCr8SpuIk5l3BvdIDoQ5NHRiB7KDnXflhQdi4fGPA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159838439814532.634745611493486; Tue, 25 Aug 2020 12:39:58 -0700 (PDT) Received: from localhost ([::1]:36802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAenU-0002r8-Pq for importer@patchew.org; Tue, 25 Aug 2020 15:39:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAeZ5-0006Uz-BX for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:25:03 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32168 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAeZ2-0006Wi-AG for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:25:02 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-262-wKrw6dV7MyKzb2rJBO8ccg-1; Tue, 25 Aug 2020 15:24:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9E3F1DDE0; Tue, 25 Aug 2020 19:24:55 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1A5C756B1; Tue, 25 Aug 2020 19:24:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598383499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A0GQIvreJFv18GeOHvceQ5h3iH7RI9UkG3JIRgmwiK4=; b=AAzh9Z9//7CEjCc1hUGYw8Lo62GGM7YhDE36D+opBN3+tc1/1z4r/WVvW+mzv79vtyi3RN ZZuQhkw+3OqzN66Bikrs+NUbdmfRkyffk1wFrjSz+aXXByyW281uHh6nrTesZ+SIHOIxvK FvKTPJ+TRb2X3B7g2b0CPTKpxUQt1LI= X-MC-Unique: wKrw6dV7MyKzb2rJBO8ccg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v3 67/74] [automated] Use DECLARE_*CHECKER* macros (pass 2) Date: Tue, 25 Aug 2020 15:21:03 -0400 Message-Id: <20200825192110.3528606-68-ehabkost@redhat.com> In-Reply-To: <20200825192110.3528606-1-ehabkost@redhat.com> References: <20200825192110.3528606-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.958, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , "Daniel P. Berrange" , Juan Quintela , Yoshinori Sato , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Cornelia Huck , Mark Cave-Ayland , Laurent Vivier , "Dr. David Alan Gilbert" , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Peter Chubb , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) $ ./scripts/codeconverter/converter.py -i \ --pattern=3DTypeCheckMacro $(git grep -l '' -- '*.[ch]') Signed-off-by: Eduardo Habkost --- Changes series v2 -> v3: this is a new patch added in series v3 The script was re-run after rebase and after additional patches were added to this series. This is being submitted as a separate patch to make review easier, but it can be squashed into the previous patch once it gets reviewed. --- Cc: Peter Maydell Cc: Laurent Vivier Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: Peter Chubb Cc: Mark Cave-Ayland Cc: David Gibson Cc: "C=C3=A9dric Le Goater" Cc: Cornelia Huck Cc: Halil Pasic Cc: Christian Borntraeger Cc: Thomas Huth Cc: Juan Quintela Cc: "Dr. David Alan Gilbert" Cc: Yoshinori Sato Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org Cc: qemu-s390x@nongnu.org --- include/hw/block/swim.h | 3 ++- include/hw/display/macfb.h | 8 ++----- include/hw/i386/x86-iommu.h | 8 ++----- include/hw/misc/imx_ccm.h | 8 ++----- include/hw/misc/mos6522.h | 7 ++---- include/hw/ppc/xive.h | 36 ++++++++++++------------------ include/hw/rdma/rdma.h | 6 +---- include/hw/s390x/s390-virtio-ccw.h | 6 ++--- migration/migration.h | 8 ++----- target/arm/cpu-qom.h | 6 ++--- target/rx/cpu-qom.h | 8 ++----- hw/arm/integratorcp.c | 12 +++++----- hw/arm/versatilepb.c | 4 ++-- hw/sd/pl181.c | 3 ++- 14 files changed, 43 insertions(+), 80 deletions(-) diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 29fccb41f1..8287da7c30 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -71,7 +71,8 @@ struct SWIMCtrl { =20 #define TYPE_SWIM "swim" typedef struct Swim Swim; -#define SWIM(obj) OBJECT_CHECK(Swim, (obj), TYPE_SWIM) +DECLARE_INSTANCE_CHECKER(Swim, SWIM, + TYPE_SWIM) =20 struct Swim { SysBusDevice parent_obj; diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index f317fe93d9..0960480b75 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -45,10 +45,8 @@ struct MacfbSysBusState { #define TYPE_NUBUS_MACFB "nubus-macfb" typedef struct MacfbNubusDeviceClass MacfbNubusDeviceClass; typedef struct MacfbNubusState MacfbNubusState; -#define NUBUS_MACFB_CLASS(class) \ - OBJECT_CLASS_CHECK(MacfbNubusDeviceClass, (class), TYPE_NUBUS_MACFB) -#define NUBUS_MACFB_GET_CLASS(obj) \ - OBJECT_GET_CLASS(MacfbNubusDeviceClass, (obj), TYPE_NUBUS_MACFB) +DECLARE_OBJ_CHECKERS(MacfbNubusState, MacfbNubusDeviceClass, + NUBUS_MACFB, TYPE_NUBUS_MACFB) =20 struct MacfbNubusDeviceClass { DeviceClass parent_class; @@ -56,8 +54,6 @@ struct MacfbNubusDeviceClass { DeviceRealize parent_realize; }; =20 -#define NUBUS_MACFB(obj) \ - OBJECT_CHECK(MacfbNubusState, (obj), TYPE_NUBUS_MACFB) =20 struct MacfbNubusState { NubusDevice busdev; diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h index dae2eab800..bbfaf44e79 100644 --- a/include/hw/i386/x86-iommu.h +++ b/include/hw/i386/x86-iommu.h @@ -28,12 +28,8 @@ #define TYPE_X86_IOMMU_DEVICE ("x86-iommu") typedef struct X86IOMMUClass X86IOMMUClass; typedef struct X86IOMMUState X86IOMMUState; -#define X86_IOMMU_DEVICE(obj) \ - OBJECT_CHECK(X86IOMMUState, (obj), TYPE_X86_IOMMU_DEVICE) -#define X86_IOMMU_DEVICE_CLASS(klass) \ - OBJECT_CLASS_CHECK(X86IOMMUClass, (klass), TYPE_X86_IOMMU_DEVICE) -#define X86_IOMMU_DEVICE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(X86IOMMUClass, obj, TYPE_X86_IOMMU_DEVICE) +DECLARE_OBJ_CHECKERS(X86IOMMUState, X86IOMMUClass, + X86_IOMMU_DEVICE, TYPE_X86_IOMMU_DEVICE) =20 #define X86_IOMMU_SID_INVALID (0xffff) =20 diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h index 174248e5df..e9d82a2a50 100644 --- a/include/hw/misc/imx_ccm.h +++ b/include/hw/misc/imx_ccm.h @@ -30,12 +30,8 @@ #define TYPE_IMX_CCM "imx.ccm" typedef struct IMXCCMClass IMXCCMClass; typedef struct IMXCCMState IMXCCMState; -#define IMX_CCM(obj) \ - OBJECT_CHECK(IMXCCMState, (obj), TYPE_IMX_CCM) -#define IMX_CCM_CLASS(klass) \ - OBJECT_CLASS_CHECK(IMXCCMClass, (klass), TYPE_IMX_CCM) -#define IMX_CCM_GET_CLASS(obj) \ - OBJECT_GET_CLASS(IMXCCMClass, (obj), TYPE_IMX_CCM) +DECLARE_OBJ_CHECKERS(IMXCCMState, IMXCCMClass, + IMX_CCM, TYPE_IMX_CCM) =20 struct IMXCCMState { /* */ diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h index b099814879..f73271ba67 100644 --- a/include/hw/misc/mos6522.h +++ b/include/hw/misc/mos6522.h @@ -126,7 +126,8 @@ typedef struct MOS6522State MOS6522State; =20 #define TYPE_MOS6522 "mos6522" typedef struct MOS6522DeviceClass MOS6522DeviceClass; -#define MOS6522(obj) OBJECT_CHECK(MOS6522State, (obj), TYPE_MOS6522) +DECLARE_OBJ_CHECKERS(MOS6522State, MOS6522DeviceClass, + MOS6522, TYPE_MOS6522) =20 struct MOS6522DeviceClass { DeviceClass parent_class; @@ -143,10 +144,6 @@ struct MOS6522DeviceClass { uint64_t (*get_timer2_load_time)(MOS6522State *dev, MOS6522Timer *ti); }; =20 -#define MOS6522_CLASS(cls) \ - OBJECT_CLASS_CHECK(MOS6522DeviceClass, (cls), TYPE_MOS6522) -#define MOS6522_GET_CLASS(obj) \ - OBJECT_GET_CLASS(MOS6522DeviceClass, (obj), TYPE_MOS6522) =20 extern const VMStateDescription vmstate_mos6522; =20 diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 8ef9af1969..48595ab641 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -155,10 +155,8 @@ typedef struct XiveNotifier XiveNotifier; #define XIVE_NOTIFIER(obj) \ INTERFACE_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER) typedef struct XiveNotifierClass XiveNotifierClass; -#define XIVE_NOTIFIER_CLASS(klass) \ - OBJECT_CLASS_CHECK(XiveNotifierClass, (klass), TYPE_XIVE_NOTIFIER) -#define XIVE_NOTIFIER_GET_CLASS(obj) \ - OBJECT_GET_CLASS(XiveNotifierClass, (obj), TYPE_XIVE_NOTIFIER) +DECLARE_CLASS_CHECKERS(XiveNotifierClass, XIVE_NOTIFIER, + TYPE_XIVE_NOTIFIER) =20 struct XiveNotifierClass { InterfaceClass parent; @@ -171,7 +169,8 @@ struct XiveNotifierClass { =20 #define TYPE_XIVE_SOURCE "xive-source" typedef struct XiveSource XiveSource; -#define XIVE_SOURCE(obj) OBJECT_CHECK(XiveSource, (obj), TYPE_XIVE_SOURCE) +DECLARE_INSTANCE_CHECKER(XiveSource, XIVE_SOURCE, + TYPE_XIVE_SOURCE) =20 /* * XIVE Interrupt Source characteristics, which define how the ESB are @@ -308,7 +307,8 @@ void xive_source_set_irq(void *opaque, int srcno, int v= al); =20 #define TYPE_XIVE_TCTX "xive-tctx" typedef struct XiveTCTX XiveTCTX; -#define XIVE_TCTX(obj) OBJECT_CHECK(XiveTCTX, (obj), TYPE_XIVE_TCTX) +DECLARE_INSTANCE_CHECKER(XiveTCTX, XIVE_TCTX, + TYPE_XIVE_TCTX) =20 /* * XIVE Thread interrupt Management register rings : @@ -349,12 +349,8 @@ typedef struct XiveRouter XiveRouter; =20 #define TYPE_XIVE_ROUTER "xive-router" typedef struct XiveRouterClass XiveRouterClass; -#define XIVE_ROUTER(obj) \ - OBJECT_CHECK(XiveRouter, (obj), TYPE_XIVE_ROUTER) -#define XIVE_ROUTER_CLASS(klass) \ - OBJECT_CLASS_CHECK(XiveRouterClass, (klass), TYPE_XIVE_ROUTER) -#define XIVE_ROUTER_GET_CLASS(obj) \ - OBJECT_GET_CLASS(XiveRouterClass, (obj), TYPE_XIVE_ROUTER) +DECLARE_OBJ_CHECKERS(XiveRouter, XiveRouterClass, + XIVE_ROUTER, TYPE_XIVE_ROUTER) =20 struct XiveRouterClass { SysBusDeviceClass parent; @@ -398,10 +394,8 @@ typedef struct XiveTCTXMatch { #define XIVE_PRESENTER(obj) \ INTERFACE_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER) typedef struct XivePresenterClass XivePresenterClass; -#define XIVE_PRESENTER_CLASS(klass) \ - OBJECT_CLASS_CHECK(XivePresenterClass, (klass), TYPE_XIVE_PRESENTER) -#define XIVE_PRESENTER_GET_CLASS(obj) \ - OBJECT_GET_CLASS(XivePresenterClass, (obj), TYPE_XIVE_PRESENTER) +DECLARE_CLASS_CHECKERS(XivePresenterClass, XIVE_PRESENTER, + TYPE_XIVE_PRESENTER) =20 struct XivePresenterClass { InterfaceClass parent; @@ -425,10 +419,8 @@ int xive_presenter_tctx_match(XivePresenter *xptr, Xiv= eTCTX *tctx, #define XIVE_FABRIC(obj) \ INTERFACE_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC) typedef struct XiveFabricClass XiveFabricClass; -#define XIVE_FABRIC_CLASS(klass) \ - OBJECT_CLASS_CHECK(XiveFabricClass, (klass), TYPE_XIVE_FABRIC) -#define XIVE_FABRIC_GET_CLASS(obj) \ - OBJECT_GET_CLASS(XiveFabricClass, (obj), TYPE_XIVE_FABRIC) +DECLARE_CLASS_CHECKERS(XiveFabricClass, XIVE_FABRIC, + TYPE_XIVE_FABRIC) =20 struct XiveFabricClass { InterfaceClass parent; @@ -444,8 +436,8 @@ struct XiveFabricClass { =20 #define TYPE_XIVE_END_SOURCE "xive-end-source" typedef struct XiveENDSource XiveENDSource; -#define XIVE_END_SOURCE(obj) \ - OBJECT_CHECK(XiveENDSource, (obj), TYPE_XIVE_END_SOURCE) +DECLARE_INSTANCE_CHECKER(XiveENDSource, XIVE_END_SOURCE, + TYPE_XIVE_END_SOURCE) =20 struct XiveENDSource { DeviceState parent; diff --git a/include/hw/rdma/rdma.h b/include/hw/rdma/rdma.h index aef82e58db..e77e43a170 100644 --- a/include/hw/rdma/rdma.h +++ b/include/hw/rdma/rdma.h @@ -20,12 +20,8 @@ #define INTERFACE_RDMA_PROVIDER "rdma" =20 typedef struct RdmaProviderClass RdmaProviderClass; -#define RDMA_PROVIDER_CLASS(klass) \ - OBJECT_CLASS_CHECK(RdmaProviderClass, (klass), \ +DECLARE_CLASS_CHECKERS(RdmaProviderClass, RDMA_PROVIDER, INTERFACE_RDMA_PROVIDER) -#define RDMA_PROVIDER_GET_CLASS(obj) \ - OBJECT_GET_CLASS(RdmaProviderClass, (obj), \ - INTERFACE_RDMA_PROVIDER) #define RDMA_PROVIDER(obj) \ INTERFACE_CHECK(RdmaProvider, (obj), \ INTERFACE_RDMA_PROVIDER) diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir= tio-ccw.h index f20c503b19..54d14da0a6 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -18,11 +18,9 @@ =20 typedef struct S390CcwMachineClass S390CcwMachineClass; typedef struct S390CcwMachineState S390CcwMachineState; -#define S390_CCW_MACHINE(obj) \ - OBJECT_CHECK(S390CcwMachineState, (obj), TYPE_S390_CCW_MACHINE) +DECLARE_OBJ_CHECKERS(S390CcwMachineState, S390CcwMachineClass, + S390_CCW_MACHINE, TYPE_S390_CCW_MACHINE) =20 -#define S390_CCW_MACHINE_CLASS(klass) \ - OBJECT_CLASS_CHECK(S390CcwMachineClass, (klass), TYPE_S390_CCW_MACHINE) =20 struct S390CcwMachineState { /*< private >*/ diff --git a/migration/migration.h b/migration/migration.h index 4103e549bb..bdc7450da3 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -116,12 +116,8 @@ void fill_destination_postcopy_migration_info(Migratio= nInfo *info); #define TYPE_MIGRATION "migration" =20 typedef struct MigrationClass MigrationClass; -#define MIGRATION_OBJ_CLASS(klass) \ - OBJECT_CLASS_CHECK(MigrationClass, (klass), TYPE_MIGRATION) -#define MIGRATION_OBJ(obj) \ - OBJECT_CHECK(MigrationState, (obj), TYPE_MIGRATION) -#define MIGRATION_OBJ_GET_CLASS(obj) \ - OBJECT_GET_CLASS(MigrationClass, (obj), TYPE_MIGRATION) +DECLARE_OBJ_CHECKERS(MigrationState, MigrationClass, + MIGRATION_OBJ, TYPE_MIGRATION) =20 struct MigrationClass { /*< private >*/ diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h index f12ca3a44c..92d58f84fe 100644 --- a/target/arm/cpu-qom.h +++ b/target/arm/cpu-qom.h @@ -63,10 +63,8 @@ struct ARMCPUClass { =20 #define TYPE_AARCH64_CPU "aarch64-cpu" typedef struct AArch64CPUClass AArch64CPUClass; -#define AARCH64_CPU_CLASS(klass) \ - OBJECT_CLASS_CHECK(AArch64CPUClass, (klass), TYPE_AARCH64_CPU) -#define AARCH64_CPU_GET_CLASS(obj) \ - OBJECT_GET_CLASS(AArch64CPUClass, (obj), TYPE_AARCH64_CPU) +DECLARE_CLASS_CHECKERS(AArch64CPUClass, AARCH64_CPU, + TYPE_AARCH64_CPU) =20 struct AArch64CPUClass { /*< private >*/ diff --git a/target/rx/cpu-qom.h b/target/rx/cpu-qom.h index dd96469e04..05f5773ab1 100644 --- a/target/rx/cpu-qom.h +++ b/target/rx/cpu-qom.h @@ -28,12 +28,8 @@ =20 typedef struct RXCPU RXCPU; typedef struct RXCPUClass RXCPUClass; -#define RX_CPU_CLASS(klass) \ - OBJECT_CLASS_CHECK(RXCPUClass, (klass), TYPE_RX_CPU) -#define RX_CPU(obj) \ - OBJECT_CHECK(RXCPU, (obj), TYPE_RX_CPU) -#define RX_CPU_GET_CLASS(obj) \ - OBJECT_GET_CLASS(RXCPUClass, (obj), TYPE_RX_CPU) +DECLARE_OBJ_CHECKERS(RXCPU, RXCPUClass, + RX_CPU, TYPE_RX_CPU) =20 /* * RXCPUClass: diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 16c575c341..93fab86cb4 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -30,8 +30,8 @@ =20 #define TYPE_INTEGRATOR_CM "integrator_core" typedef struct IntegratorCMState IntegratorCMState; -#define INTEGRATOR_CM(obj) \ - OBJECT_CHECK(IntegratorCMState, (obj), TYPE_INTEGRATOR_CM) +DECLARE_INSTANCE_CHECKER(IntegratorCMState, INTEGRATOR_CM, + TYPE_INTEGRATOR_CM) =20 struct IntegratorCMState { /*< private >*/ @@ -329,8 +329,8 @@ static void integratorcm_realize(DeviceState *d, Error = **errp) =20 #define TYPE_INTEGRATOR_PIC "integrator_pic" typedef struct icp_pic_state icp_pic_state; -#define INTEGRATOR_PIC(obj) \ - OBJECT_CHECK(icp_pic_state, (obj), TYPE_INTEGRATOR_PIC) +DECLARE_INSTANCE_CHECKER(icp_pic_state, INTEGRATOR_PIC, + TYPE_INTEGRATOR_PIC) =20 struct icp_pic_state { /*< private >*/ @@ -469,8 +469,8 @@ static void icp_pic_init(Object *obj) =20 #define TYPE_ICP_CONTROL_REGS "icp-ctrl-regs" typedef struct ICPCtrlRegsState ICPCtrlRegsState; -#define ICP_CONTROL_REGS(obj) \ - OBJECT_CHECK(ICPCtrlRegsState, (obj), TYPE_ICP_CONTROL_REGS) +DECLARE_INSTANCE_CHECKER(ICPCtrlRegsState, ICP_CONTROL_REGS, + TYPE_ICP_CONTROL_REGS) =20 struct ICPCtrlRegsState { /*< private >*/ diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 091ad34ac3..ab4251dcc1 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -36,8 +36,8 @@ =20 #define TYPE_VERSATILE_PB_SIC "versatilepb_sic" typedef struct vpb_sic_state vpb_sic_state; -#define VERSATILE_PB_SIC(obj) \ - OBJECT_CHECK(vpb_sic_state, (obj), TYPE_VERSATILE_PB_SIC) +DECLARE_INSTANCE_CHECKER(vpb_sic_state, VERSATILE_PB_SIC, + TYPE_VERSATILE_PB_SIC) =20 struct vpb_sic_state { SysBusDevice parent_obj; diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index f44817c654..f58b947e89 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -24,7 +24,8 @@ =20 #define TYPE_PL181 "pl181" typedef struct PL181State PL181State; -#define PL181(obj) OBJECT_CHECK(PL181State, (obj), TYPE_PL181) +DECLARE_INSTANCE_CHECKER(PL181State, PL181, + TYPE_PL181) =20 #define TYPE_PL181_BUS "pl181-bus" =20 --=20 2.26.2