[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/53] megasas: Rename QOM class cast macros
From: |
Eduardo Habkost |
Subject: |
[PULL 03/53] megasas: Rename QOM class cast macros |
Date: |
Thu, 27 Aug 2020 15:20:32 -0400 |
Rename the MEGASAS_DEVICE_CLASS() and MEGASAS_DEVICE_GET_CLASS()
macros to be consistent with the MEGASAS() instance cast macro.
This will allow us to register the type cast macros using
OBJECT_DECLARE_TYPE later.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-3-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/scsi/megasas.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 5cfd1bf22e..390c2f2edb 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -134,9 +134,9 @@ typedef struct MegasasBaseClass {
#define MEGASAS(obj) \
OBJECT_CHECK(MegasasState, (obj), TYPE_MEGASAS_BASE)
-#define MEGASAS_DEVICE_CLASS(oc) \
+#define MEGASAS_CLASS(oc) \
OBJECT_CLASS_CHECK(MegasasBaseClass, (oc), TYPE_MEGASAS_BASE)
-#define MEGASAS_DEVICE_GET_CLASS(oc) \
+#define MEGASAS_GET_CLASS(oc) \
OBJECT_GET_CLASS(MegasasBaseClass, (oc), TYPE_MEGASAS_BASE)
#define MEGASAS_INTR_DISABLED_MASK 0xFFFFFFFF
@@ -733,7 +733,7 @@ static int megasas_ctrl_get_info(MegasasState *s,
MegasasCmd *cmd)
{
PCIDevice *pci_dev = PCI_DEVICE(s);
PCIDeviceClass *pci_class = PCI_DEVICE_GET_CLASS(pci_dev);
- MegasasBaseClass *base_class = MEGASAS_DEVICE_GET_CLASS(s);
+ MegasasBaseClass *base_class = MEGASAS_GET_CLASS(s);
struct mfi_ctrl_info info;
size_t dcmd_size = sizeof(info);
BusChild *kid;
@@ -1999,7 +1999,7 @@ static uint64_t megasas_mmio_read(void *opaque, hwaddr
addr,
{
MegasasState *s = opaque;
PCIDevice *pci_dev = PCI_DEVICE(s);
- MegasasBaseClass *base_class = MEGASAS_DEVICE_GET_CLASS(s);
+ MegasasBaseClass *base_class = MEGASAS_GET_CLASS(s);
uint32_t retval = 0;
switch (addr) {
@@ -2322,7 +2322,7 @@ static const struct SCSIBusInfo megasas_scsi_info = {
static void megasas_scsi_realize(PCIDevice *dev, Error **errp)
{
MegasasState *s = MEGASAS(dev);
- MegasasBaseClass *b = MEGASAS_DEVICE_GET_CLASS(s);
+ MegasasBaseClass *b = MEGASAS_GET_CLASS(s);
uint8_t *pci_conf;
int i, bar_type;
Error *err = NULL;
@@ -2506,7 +2506,7 @@ static void megasas_class_init(ObjectClass *oc, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
- MegasasBaseClass *e = MEGASAS_DEVICE_CLASS(oc);
+ MegasasBaseClass *e = MEGASAS_CLASS(oc);
const MegasasInfo *info = data;
pc->realize = megasas_scsi_realize;
--
2.26.2
- [PULL 00/53] Machine queue + QOM fixes and cleanups, Eduardo Habkost, 2020/08/27
- [PULL 02/53] e1000: Rename QOM class cast macros, Eduardo Habkost, 2020/08/27
- [PULL 01/53] numa: hmat: fix cache size check, Eduardo Habkost, 2020/08/27
- [PULL 03/53] megasas: Rename QOM class cast macros,
Eduardo Habkost <=
- [PULL 04/53] vmw_pvscsi: Rename QOM class cast macros, Eduardo Habkost, 2020/08/27
- [PULL 05/53] pl110: Rename pl110_version enum values, Eduardo Habkost, 2020/08/27
- [PULL 06/53] allwinner-h3: Rename memmap enum constants, Eduardo Habkost, 2020/08/27
- [PULL 09/53] aspeed_timer: Fix ASPEED_TIMER macro definition, Eduardo Habkost, 2020/08/27
- [PULL 08/53] opentitan: Rename memmap enum constants, Eduardo Habkost, 2020/08/27
- [PULL 10/53] versatile: Fix typo in PCI_VPB_HOST definition, Eduardo Habkost, 2020/08/27
- [PULL 07/53] aspeed_soc: Rename memmap/irqmap enum constants, Eduardo Habkost, 2020/08/27
- [PULL 11/53] virtio-ccw: Fix definition of VIRTIO_CCW_BUS_GET_CLASS, Eduardo Habkost, 2020/08/27
- [PULL 12/53] hvf: Add missing include, Eduardo Habkost, 2020/08/27
- [PULL 14/53] tulip: Move TulipState typedef to header, Eduardo Habkost, 2020/08/27