[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/33] sabre: Rename SABRE_DEVICE to SABRE
From: |
Eduardo Habkost |
Subject: |
[PULL 23/33] sabre: Rename SABRE_DEVICE to SABRE |
Date: |
Thu, 10 Sep 2020 14:21:02 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200902224311.1321159-49-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
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 67985414e2..b4aabfc076 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
- [PULL 07/33] codeconverter: script for automating QOM code cleanups, (continued)
- [PULL 07/33] codeconverter: script for automating QOM code cleanups, Eduardo Habkost, 2020/09/10
- [PULL 15/33] ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE, Eduardo Habkost, 2020/09/10
- [PULL 17/33] vfio: Rename VFIO_AP_DEVICE_TYPE to TYPE_VFIO_AP_DEVICE, Eduardo Habkost, 2020/09/10
- [PULL 16/33] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV, Eduardo Habkost, 2020/09/10
- [PULL 19/33] ahci: Rename ICH_AHCI to ICH9_AHCI, Eduardo Habkost, 2020/09/10
- [PULL 18/33] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID, Eduardo Habkost, 2020/09/10
- [PULL 27/33] tusb6010: Rename TUSB to TUSB6010, Eduardo Habkost, 2020/09/10
- [PULL 20/33] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/10
- [PULL 21/33] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER, Eduardo Habkost, 2020/09/10
- [PULL 10/33] Use DECLARE_*CHECKER* macros, Eduardo Habkost, 2020/09/10
- [PULL 23/33] sabre: Rename SABRE_DEVICE to SABRE,
Eduardo Habkost <=
- [PULL 24/33] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/10
- [PULL 22/33] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/10
- [PULL 28/33] xilinx_axidma: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10
- [PULL 29/33] omap_intc: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10
- [PULL 25/33] vfio: Rename PCI_VFIO to VFIO_PCI, Eduardo Habkost, 2020/09/10
- [PULL 31/33] xilinx_axienet: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10
- [PULL 30/33] lpc_ich9: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10
- [PULL 26/33] pc87312: Rename TYPE_PC87312_SUPERIO to TYPE_PC87312, Eduardo Habkost, 2020/09/10
- [PULL 33/33] virtio-vga: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10
- [PULL 32/33] vhost-user-vga: Use typedef name for instance_size, Eduardo Habkost, 2020/09/10