[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 43/74] nubus: Rename class type checking macros
From: |
Eduardo Habkost |
Subject: |
[PATCH v3 43/74] nubus: Rename class type checking macros |
Date: |
Tue, 25 Aug 2020 15:20:39 -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>
---
Changes series v2 -> v3: new patch added in series v3
---
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: qemu-devel@nongnu.org
---
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
- [PATCH v3 33/74] pckbd: Move QOM macro to header, (continued)
- [PATCH v3 33/74] pckbd: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 34/74] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/25
- [PATCH v3 35/74] virtio-serial-bus: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 36/74] piix: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 37/74] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 38/74] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 40/74] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 39/74] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 41/74] kvm: Move QOM macros to kvm.h, Eduardo Habkost, 2020/08/25
- [PATCH v3 42/74] vfio/pci: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 43/74] nubus: Rename class type checking macros,
Eduardo Habkost <=
- [PATCH v3 44/74] imx_ccm: Rename IMX_GET_CLASS macro, Eduardo Habkost, 2020/08/25
- [PATCH v3 45/74] mos6522: Rename QOM macros, Eduardo Habkost, 2020/08/25
- [PATCH v3 47/74] rdma: Rename INTERFACE_RDMA_PROVIDER_CLASS macro, Eduardo Habkost, 2020/08/25
- [PATCH v3 46/74] x86-iommu: Rename QOM type macros, Eduardo Habkost, 2020/08/25
- [PATCH v3 48/74] s390-virtio-ccw: Rename S390_MACHINE_CLASS macro, Eduardo Habkost, 2020/08/25