[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 42/53] nubus: Rename class type checking macros
From: |
Eduardo Habkost |
Subject: |
[PULL 42/53] nubus: Rename class type checking macros |
Date: |
Thu, 27 Aug 2020 15:21:11 -0400 |
Rename the existing class type checking macros to be consistent
with the type name and instance type checking macro. Use a
NUBUS_MACFB prefix instead of MACFB_NUBUS.
This will make future conversion to OBJECT_DECLARE* easier.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-44-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/display/macfb.h | 4 ++--
hw/display/macfb.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h
index 26367ae2c4..347871b623 100644
--- a/include/hw/display/macfb.h
+++ b/include/hw/display/macfb.h
@@ -40,9 +40,9 @@ typedef struct {
MacfbState macfb;
} MacfbSysBusState;
-#define MACFB_NUBUS_DEVICE_CLASS(class) \
+#define NUBUS_MACFB_CLASS(class) \
OBJECT_CLASS_CHECK(MacfbNubusDeviceClass, (class), TYPE_NUBUS_MACFB)
-#define MACFB_NUBUS_GET_CLASS(obj) \
+#define NUBUS_MACFB_GET_CLASS(obj) \
OBJECT_GET_CLASS(MacfbNubusDeviceClass, (obj), TYPE_NUBUS_MACFB)
typedef struct MacfbNubusDeviceClass {
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index b68faff4bb..ff8bdb846b 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -391,7 +391,7 @@ static void macfb_nubus_realize(DeviceState *dev, Error
**errp)
{
NubusDevice *nd = NUBUS_DEVICE(dev);
MacfbNubusState *s = NUBUS_MACFB(dev);
- MacfbNubusDeviceClass *ndc = MACFB_NUBUS_GET_CLASS(dev);
+ MacfbNubusDeviceClass *ndc = NUBUS_MACFB_GET_CLASS(dev);
MacfbState *ms = &s->macfb;
ndc->parent_realize(dev, errp);
@@ -443,7 +443,7 @@ static void macfb_sysbus_class_init(ObjectClass *klass,
void *data)
static void macfb_nubus_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- MacfbNubusDeviceClass *ndc = MACFB_NUBUS_DEVICE_CLASS(klass);
+ MacfbNubusDeviceClass *ndc = NUBUS_MACFB_CLASS(klass);
device_class_set_parent_realize(dc, macfb_nubus_realize,
&ndc->parent_realize);
--
2.26.2
- [PULL 33/53] vmbus: Move QOM macros to vmbus.h, (continued)
- [PULL 33/53] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/27
- [PULL 37/53] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 34/53] virtio-serial-bus: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 36/53] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 35/53] piix: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 38/53] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 39/53] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 41/53] vfio/pci: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 40/53] kvm: Move QOM macros to kvm.h, Eduardo Habkost, 2020/08/27
- [PULL 43/53] s390-virtio-ccw: Rename S390_MACHINE_CLASS macro, Eduardo Habkost, 2020/08/27
- [PULL 42/53] nubus: Rename class type checking macros,
Eduardo Habkost <=
- [PULL 44/53] swim: Rename struct SWIM to Swim, Eduardo Habkost, 2020/08/27
- [PULL 45/53] migration: Rename class type checking macros, Eduardo Habkost, 2020/08/27
- [PULL 47/53] nios2_iic: Use TYPE_ALTERA_IIC constant, Eduardo Habkost, 2020/08/27
- [PULL 46/53] etsec: Use TYPE_ETSEC_COMMON constant, Eduardo Habkost, 2020/08/27
- [PULL 49/53] sclpconsole: Use TYPE_* constants, Eduardo Habkost, 2020/08/27
- [PULL 48/53] amd_iommu: Use TYPE_AMD_IOMMU_PCI constant, Eduardo Habkost, 2020/08/27
- [PULL 51/53] tosa: Use TYPE_TOSA_MISC_GPIO constant, Eduardo Habkost, 2020/08/27
- [PULL 50/53] xlnx-zcu102: Use TYPE_ZCU102_MACHINE constant, Eduardo Habkost, 2020/08/27
- [PULL 52/53] ppce500: Use TYPE_PPC_E500_PCI_BRIDGE constant, Eduardo Habkost, 2020/08/27
- [PULL 53/53] dc390: Use TYPE_DC390_DEVICE constant, Eduardo Habkost, 2020/08/27