mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sabre: Rename SABRE_DEVICE to SABRE

Browse Source 
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>
This commit is contained in:
Eduardo Habkost 2020-09-02 18:42:56 -04:00
parent 5182f17593
commit 5b07883c2b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/pci-host/sabre.c
View File

@ -338,7 +338,7 @@ static void pci_sabre_set_irq(void *opaque, int irq_num, int level)
static void sabre_reset(DeviceState *d) static void sabre_reset(DeviceState *d)
{ {
SabreState *s = SABRE_DEVICE(d); SabreState *s = SABRE(d);
PCIDevice *pci_dev; PCIDevice *pci_dev;
unsigned int i; unsigned int i;
uint16_t cmd; uint16_t cmd;
@ -376,7 +376,7 @@ static const MemoryRegionOps pci_config_ops = {
static void sabre_realize(DeviceState *dev, Error **errp) static void sabre_realize(DeviceState *dev, Error **errp)
{ {
SabreState *s = SABRE_DEVICE(dev); SabreState *s = SABRE(dev);
PCIHostState *phb = PCI_HOST_BRIDGE(dev); PCIHostState *phb = PCI_HOST_BRIDGE(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(s); SysBusDevice *sbd = SYS_BUS_DEVICE(s);
PCIDevice *pci_dev; PCIDevice *pci_dev;
@ -421,7 +421,7 @@ static void sabre_realize(DeviceState *dev, Error **errp)
static void sabre_init(Object *obj) static void sabre_init(Object *obj)
{ {
SabreState *s = SABRE_DEVICE(obj); SabreState *s = SABRE(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
unsigned int i; unsigned int i;
@ -502,7 +502,7 @@ static const TypeInfo sabre_pci_info = {
static char *sabre_ofw_unit_address(const SysBusDevice *dev) static char *sabre_ofw_unit_address(const SysBusDevice *dev)
{ {
SabreState *s = SABRE_DEVICE(dev); SabreState *s = SABRE(dev);
return g_strdup_printf("%x,%x", return g_strdup_printf("%x,%x",
(uint32_t)((s->special_base >> 32) & 0xffffffff), (uint32_t)((s->special_base >> 32) & 0xffffffff),

2
hw/sparc64/sun4u.c
View File

@ -585,7 +585,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
prom_init(hwdef->prom_addr, bios_name); prom_init(hwdef->prom_addr, bios_name);
/* Init sabre (PCI host bridge) */ /* 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), "special-base", PBM_SPECIAL_BASE);
qdev_prop_set_uint64(DEVICE(sabre), "mem-base", PBM_MEM_BASE); qdev_prop_set_uint64(DEVICE(sabre), "mem-base", PBM_MEM_BASE);
object_property_set_link(OBJECT(sabre), "iommu", OBJECT(iommu), object_property_set_link(OBJECT(sabre), "iommu", OBJECT(iommu),

2
include/hw/pci-host/sabre.h
View File

@ -51,7 +51,7 @@ struct SabreState {
typedef struct SabreState SabreState; typedef struct SabreState SabreState;
#define TYPE_SABRE "sabre" #define TYPE_SABRE "sabre"
DECLARE_INSTANCE_CHECKER(SabreState, SABRE_DEVICE, DECLARE_INSTANCE_CHECKER(SabreState, SABRE,
TYPE_SABRE) TYPE_SABRE)
#endif #endif