diff options
| -rw-r--r-- | hw/i2c/core.c | 4 | ||||
| -rw-r--r-- | hw/pci/pci.c | 2 | ||||
| -rw-r--r-- | hw/ssi/ssi.c | 2 | ||||
| -rw-r--r-- | include/hw/qdev-core.h | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 0c4fc1dbaa..22ef3b9617 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -66,7 +66,7 @@ i2c_bus *i2c_init_bus(DeviceState *parent, const char *name) { i2c_bus *bus; - bus = FROM_QBUS(i2c_bus, qbus_create(TYPE_I2C_BUS, parent, name)); + bus = I2C_BUS(qbus_create(TYPE_I2C_BUS, parent, name)); vmstate_register(NULL, -1, &vmstate_i2c_bus, bus); return bus; } @@ -183,7 +183,7 @@ static int i2c_slave_post_load(void *opaque, int version_id) { I2CSlave *dev = opaque; i2c_bus *bus; - bus = FROM_QBUS(i2c_bus, qdev_get_parent_bus(&dev->qdev)); + bus = I2C_BUS(qdev_get_parent_bus(DEVICE(dev))); if (bus->saved_address == dev->address) { bus->current_dev = dev; } diff --git a/hw/pci/pci.c b/hw/pci/pci.c index bb3879bd88..a3eb19ead2 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1700,7 +1700,7 @@ static int pci_qdev_init(DeviceState *qdev) pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; } - bus = FROM_QBUS(PCIBus, qdev_get_parent_bus(qdev)); + bus = PCI_BUS(qdev_get_parent_bus(qdev)); pci_dev = do_pci_register_device(pci_dev, bus, object_get_typename(OBJECT(qdev)), pci_dev->devfn); diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index 1264d9da23..2c25260875 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -103,7 +103,7 @@ SSIBus *ssi_create_bus(DeviceState *parent, const char *name) { BusState *bus; bus = qbus_create(TYPE_SSI_BUS, parent, name); - return FROM_QBUS(SSIBus, bus); + return SSI_BUS(bus); } uint32_t ssi_transfer(SSIBus *bus, uint32_t val) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index cf83d5471a..7fbffcbaad 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -261,8 +261,6 @@ void qbus_reset_all_fn(void *opaque); void qbus_free(BusState *bus); -#define FROM_QBUS(type, dev) DO_UPCAST(type, qbus, dev) - /* This should go away once we get rid of the NULL bus hack */ BusState *sysbus_get_default(void); |