yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

qbus: Rename qbus_create() to qbus_new()

Browse Source 
Rename the "allocate and return" qbus creation function to
qbus_new(), to bring it into line with our _init vs _new convention.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Corey Minyard <cminyard@mvista.com>
Message-id: 20210923121153.23754-6-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-09-23 13:11:52 +01:00
parent d637e1dc6d
commit 9388d1701e
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/core/bus.c
View File

@ -159,7 +159,7 @@ void qbus_init(void *bus, size_t size, const char *typename,
qbus_init_internal(bus, parent, name); qbus_init_internal(bus, parent, name);
} }
BusState *qbus_create(const char *typename, DeviceState *parent, const char *name) BusState *qbus_new(const char *typename, DeviceState *parent, const char *name)
{ {
BusState *bus; BusState *bus;

2
hw/hyperv/vmbus.c
View File

@ -2729,7 +2729,7 @@ static void vmbus_bridge_realize(DeviceState *dev, Error **errp)
return; return;
} }
bridge->bus = VMBUS(qbus_create(TYPE_VMBUS, dev, "vmbus")); bridge->bus = VMBUS(qbus_new(TYPE_VMBUS, dev, "vmbus"));
} }
static char *vmbus_bridge_ofw_unit_address(const SysBusDevice *dev) static char *vmbus_bridge_ofw_unit_address(const SysBusDevice *dev)

2
hw/i2c/core.c
View File

@ -60,7 +60,7 @@ I2CBus *i2c_init_bus(DeviceState *parent, const char *name)
{ {
I2CBus *bus; I2CBus *bus;
bus = I2C_BUS(qbus_create(TYPE_I2C_BUS, parent, name)); bus = I2C_BUS(qbus_new(TYPE_I2C_BUS, parent, name));
QLIST_INIT(&bus->current_devs); QLIST_INIT(&bus->current_devs);
vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_i2c_bus, bus); vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_i2c_bus, bus);
return bus; return bus;

2
hw/isa/isa-bus.c
View File

@ -64,7 +64,7 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion* address_space,
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
} }
isabus = ISA_BUS(qbus_create(TYPE_ISA_BUS, dev, NULL)); isabus = ISA_BUS(qbus_new(TYPE_ISA_BUS, dev, NULL));
isabus->address_space = address_space; isabus->address_space = address_space;
isabus->address_space_io = address_space_io; isabus->address_space_io = address_space_io;
return isabus; return isabus;

2
hw/misc/auxbus.c
View File

@ -65,7 +65,7 @@ AUXBus *aux_bus_init(DeviceState *parent, const char *name)
AUXBus *bus; AUXBus *bus;
Object *auxtoi2c; Object *auxtoi2c;
bus = AUX_BUS(qbus_create(TYPE_AUX_BUS, parent, name)); bus = AUX_BUS(qbus_new(TYPE_AUX_BUS, parent, name));
auxtoi2c = object_new_with_props(TYPE_AUXTOI2C, OBJECT(bus), "i2c", auxtoi2c = object_new_with_props(TYPE_AUXTOI2C, OBJECT(bus), "i2c",
&error_abort, NULL); &error_abort, NULL);

2
hw/pci/pci.c
View File

@ -478,7 +478,7 @@ PCIBus *pci_root_bus_new(DeviceState *parent, const char *name,
{ {
PCIBus *bus; PCIBus *bus;
bus = PCI_BUS(qbus_create(typename, parent, name)); bus = PCI_BUS(qbus_new(typename, parent, name));
pci_root_bus_internal_init(bus, parent, address_space_mem, pci_root_bus_internal_init(bus, parent, address_space_mem,
address_space_io, devfn_min); address_space_io, devfn_min);
return bus; return bus;

2
hw/ppc/spapr_vio.c
View File

@ -577,7 +577,7 @@ SpaprVioBus *spapr_vio_bus_init(void)
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
/* Create bus on bridge device */ /* Create bus on bridge device */
qbus = qbus_create(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio"); qbus = qbus_new(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio");
bus = SPAPR_VIO_BUS(qbus); bus = SPAPR_VIO_BUS(qbus);
bus->next_reg = SPAPR_VIO_REG_BASE; bus->next_reg = SPAPR_VIO_REG_BASE;

2
hw/s390x/ap-bridge.c
View File

@ -55,7 +55,7 @@ void s390_init_ap(void)
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
/* Create bus on bridge device */ /* Create bus on bridge device */
bus = qbus_create(TYPE_AP_BUS, dev, TYPE_AP_BUS); bus = qbus_new(TYPE_AP_BUS, dev, TYPE_AP_BUS);
/* Enable hotplugging */ /* Enable hotplugging */
qbus_set_hotplug_handler(bus, OBJECT(dev)); qbus_set_hotplug_handler(bus, OBJECT(dev));

2
hw/s390x/css-bridge.c
View File

@ -106,7 +106,7 @@ VirtualCssBus *virtual_css_bus_init(void)
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
/* Create bus on bridge device */ /* Create bus on bridge device */
bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css"); bus = qbus_new(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css");
cbus = VIRTUAL_CSS_BUS(bus); cbus = VIRTUAL_CSS_BUS(bus);
/* Enable hotplugging */ /* Enable hotplugging */

2
hw/s390x/s390-pci-bus.c
View File

@ -813,7 +813,7 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp)
qbus_set_hotplug_handler(bus, OBJECT(dev)); qbus_set_hotplug_handler(bus, OBJECT(dev));
phb->bus = b; phb->bus = b;
s->bus = S390_PCI_BUS(qbus_create(TYPE_S390_PCI_BUS, dev, NULL)); s->bus = S390_PCI_BUS(qbus_new(TYPE_S390_PCI_BUS, dev, NULL));
qbus_set_hotplug_handler(BUS(s->bus), OBJECT(dev)); qbus_set_hotplug_handler(BUS(s->bus), OBJECT(dev));
s->iommu_table = g_hash_table_new_full(g_int64_hash, g_int64_equal, s->iommu_table = g_hash_table_new_full(g_int64_hash, g_int64_equal,

2
hw/ssi/ssi.c
View File

@ -107,7 +107,7 @@ DeviceState *ssi_create_peripheral(SSIBus *bus, const char *name)
SSIBus *ssi_create_bus(DeviceState *parent, const char *name) SSIBus *ssi_create_bus(DeviceState *parent, const char *name)
{ {
BusState *bus; BusState *bus;
bus = qbus_create(TYPE_SSI_BUS, parent, name); bus = qbus_new(TYPE_SSI_BUS, parent, name);
return SSI_BUS(bus); return SSI_BUS(bus);
} }

2
hw/xen/xen-bus.c
View File

@ -1398,7 +1398,7 @@ type_init(xen_register_types)
void xen_bus_init(void) void xen_bus_init(void)
{ {
DeviceState *dev = qdev_new(TYPE_XEN_BRIDGE); DeviceState *dev = qdev_new(TYPE_XEN_BRIDGE);
BusState *bus = qbus_create(TYPE_XEN_BUS, dev, NULL); BusState *bus = qbus_new(TYPE_XEN_BUS, dev, NULL);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
qbus_set_bus_hotplug_handler(bus); qbus_set_bus_hotplug_handler(bus);

2
hw/xen/xen-legacy-backend.c
View File

@ -702,7 +702,7 @@ int xen_be_init(void)
xen_sysdev = qdev_new(TYPE_XENSYSDEV); xen_sysdev = qdev_new(TYPE_XENSYSDEV);
sysbus_realize_and_unref(SYS_BUS_DEVICE(xen_sysdev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(xen_sysdev), &error_fatal);
xen_sysbus = qbus_create(TYPE_XENSYSBUS, xen_sysdev, "xen-sysbus"); xen_sysbus = qbus_new(TYPE_XENSYSBUS, xen_sysdev, "xen-sysbus");
qbus_set_bus_hotplug_handler(xen_sysbus); qbus_set_bus_hotplug_handler(xen_sysbus);
return 0; return 0;

2
include/hw/qdev-core.h
View File

@ -680,7 +680,7 @@ typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);
void qbus_init(void *bus, size_t size, const char *typename, void qbus_init(void *bus, size_t size, const char *typename,
DeviceState *parent, const char *name); DeviceState *parent, const char *name);
BusState *qbus_create(const char *typename, DeviceState *parent, const char *name); BusState *qbus_new(const char *typename, DeviceState *parent, const char *name);
bool qbus_realize(BusState *bus, Error **errp); bool qbus_realize(BusState *bus, Error **errp);
void qbus_unrealize(BusState *bus); void qbus_unrealize(BusState *bus);