[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 48/63] sabre: Rename SABRE_DEVICE to SABRE
From: |
Eduardo Habkost |
Subject: |
[PATCH 48/63] sabre: Rename SABRE_DEVICE to SABRE |
Date: |
Wed, 2 Sep 2020 18:42:56 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Cc: qemu-devel@nongnu.org
---
include/hw/pci-host/sabre.h | 2 +-
hw/pci-host/sabre.c | 8 ++++----
hw/sparc64/sun4u.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/hw/pci-host/sabre.h b/include/hw/pci-host/sabre.h
index 597bf70d69..7a76de4b9e 100644
--- a/include/hw/pci-host/sabre.h
+++ b/include/hw/pci-host/sabre.h
@@ -51,7 +51,7 @@ struct SabreState {
typedef struct SabreState SabreState;
#define TYPE_SABRE "sabre"
-DECLARE_INSTANCE_CHECKER(SabreState, SABRE_DEVICE,
+DECLARE_INSTANCE_CHECKER(SabreState, SABRE,
TYPE_SABRE)
#endif
diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index 0cc68585f8..5ac6283623 100644
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -338,7 +338,7 @@ static void pci_sabre_set_irq(void *opaque, int irq_num,
int level)
static void sabre_reset(DeviceState *d)
{
- SabreState *s = SABRE_DEVICE(d);
+ SabreState *s = SABRE(d);
PCIDevice *pci_dev;
unsigned int i;
uint16_t cmd;
@@ -376,7 +376,7 @@ static const MemoryRegionOps pci_config_ops = {
static void sabre_realize(DeviceState *dev, Error **errp)
{
- SabreState *s = SABRE_DEVICE(dev);
+ SabreState *s = SABRE(dev);
PCIHostState *phb = PCI_HOST_BRIDGE(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(s);
PCIDevice *pci_dev;
@@ -421,7 +421,7 @@ static void sabre_realize(DeviceState *dev, Error **errp)
static void sabre_init(Object *obj)
{
- SabreState *s = SABRE_DEVICE(obj);
+ SabreState *s = SABRE(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
unsigned int i;
@@ -502,7 +502,7 @@ static const TypeInfo sabre_pci_info = {
static char *sabre_ofw_unit_address(const SysBusDevice *dev)
{
- SabreState *s = SABRE_DEVICE(dev);
+ SabreState *s = SABRE(dev);
return g_strdup_printf("%x,%x",
(uint32_t)((s->special_base >> 32) & 0xffffffff),
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index fe0d84bf6c..b746c3bf38 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -585,7 +585,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
prom_init(hwdef->prom_addr, bios_name);
/* Init sabre (PCI host bridge) */
- sabre = SABRE_DEVICE(qdev_new(TYPE_SABRE));
+ sabre = SABRE(qdev_new(TYPE_SABRE));
qdev_prop_set_uint64(DEVICE(sabre), "special-base", PBM_SPECIAL_BASE);
qdev_prop_set_uint64(DEVICE(sabre), "mem-base", PBM_MEM_BASE);
object_property_set_link(OBJECT(sabre), "iommu", OBJECT(iommu),
--
2.26.2
- [PATCH 43/63] pvpanic: Rename ISA_PVPANIC_DEVICE to PVPANIC, (continued)
- [PATCH 43/63] pvpanic: Rename ISA_PVPANIC_DEVICE to PVPANIC, Eduardo Habkost, 2020/09/02
- [PATCH 44/63] renesas: Rename RCMT to RENESAS_CMT, Eduardo Habkost, 2020/09/02
- [PATCH 46/63] renesas: Rename RTMR to RENESAS_TMR, Eduardo Habkost, 2020/09/02
- [PATCH 45/63] renesas: Rename RSCI to RENESAS_SCI, Eduardo Habkost, 2020/09/02
- [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/02
- [PATCH 49/63] stm32f205: Rename STM32F2XXTIMER to STM32F2XX_TIMER, Eduardo Habkost, 2020/09/02
- [PATCH 48/63] sabre: Rename SABRE_DEVICE to SABRE,
Eduardo Habkost <=
- [PATCH 50/63] tpm_crb: Rename CRB to TPM_CRB, Eduardo Habkost, 2020/09/02
- [PATCH 52/63] usb: Rename USB_REDIRECT to USB_REDIR, Eduardo Habkost, 2020/09/02
- [PATCH 51/63] tpm_spapr: Rename VIO_SPAPR_VTPM to TPM_SPAPR, Eduardo Habkost, 2020/09/02
- [PATCH 53/63] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/02
- [PATCH 54/63] usb: Rename USB_STORAGE_DEV to USB_STORAGE, Eduardo Habkost, 2020/09/02
- [PATCH 56/63] vmxnet3: Rename VMXNET3_DEVICE* to VMXNET3*, Eduardo Habkost, 2020/09/02