qbus: Rename qbus_create_inplace() to qbus_init()

Rename qbus_create_inplace() to qbus_init(); this is more in line
with our usual naming convention for functions that in-place
initialize objects.

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>
Message-id: 20210923121153.23754-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-09-23 13:11:51 +01:00
parent 8d4cdf01f8
commit d637e1dc6d
32 changed files with 54 additions and 61 deletions

View File

@ -52,7 +52,7 @@ void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size,
hda_codec_response_func response, hda_codec_response_func response,
hda_codec_xfer_func xfer) hda_codec_xfer_func xfer)
{ {
qbus_create_inplace(bus, bus_size, TYPE_HDA_BUS, dev, NULL); qbus_init(bus, bus_size, TYPE_HDA_BUS, dev, NULL);
bus->response = response; bus->response = response;
bus->xfer = xfer; bus->xfer = xfer;
} }

View File

@ -77,7 +77,7 @@ static const TypeInfo floppy_bus_info = {
static void floppy_bus_create(FDCtrl *fdc, FloppyBus *bus, DeviceState *dev) static void floppy_bus_create(FDCtrl *fdc, FloppyBus *bus, DeviceState *dev)
{ {
qbus_create_inplace(bus, sizeof(FloppyBus), TYPE_FLOPPY_BUS, dev, NULL); qbus_init(bus, sizeof(FloppyBus), TYPE_FLOPPY_BUS, dev, NULL);
bus->fdc = fdc; bus->fdc = fdc;
} }

View File

@ -421,8 +421,7 @@ static void sysbus_swim_realize(DeviceState *dev, Error **errp)
Swim *sys = SWIM(dev); Swim *sys = SWIM(dev);
SWIMCtrl *swimctrl = &sys->ctrl; SWIMCtrl *swimctrl = &sys->ctrl;
qbus_create_inplace(&swimctrl->bus, sizeof(SWIMBus), TYPE_SWIM_BUS, dev, qbus_init(&swimctrl->bus, sizeof(SWIMBus), TYPE_SWIM_BUS, dev, NULL);
NULL);
swimctrl->bus.ctrl = swimctrl; swimctrl->bus.ctrl = swimctrl;
} }

View File

@ -1048,8 +1048,8 @@ static void virtio_serial_device_realize(DeviceState *dev, Error **errp)
config_size); config_size);
/* Spawn a new virtio-serial bus on which the ports will ride as devices */ /* Spawn a new virtio-serial bus on which the ports will ride as devices */
qbus_create_inplace(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS, qbus_init(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS,
dev, vdev->bus_name); dev, vdev->bus_name);
qbus_set_hotplug_handler(BUS(&vser->bus), OBJECT(vser)); qbus_set_hotplug_handler(BUS(&vser->bus), OBJECT(vser));
vser->bus.vser = vser; vser->bus.vser = vser;
QTAILQ_INIT(&vser->ports); QTAILQ_INIT(&vser->ports);

View File

@ -99,7 +99,8 @@ static void bus_reset_child_foreach(Object *obj, ResettableChildCallback cb,
} }
} }
static void qbus_init(BusState *bus, DeviceState *parent, const char *name) static void qbus_init_internal(BusState *bus, DeviceState *parent,
const char *name)
{ {
const char *typename = object_get_typename(OBJECT(bus)); const char *typename = object_get_typename(OBJECT(bus));
BusClass *bc; BusClass *bc;
@ -151,11 +152,11 @@ static void bus_unparent(Object *obj)
bus->parent = NULL; bus->parent = NULL;
} }
void qbus_create_inplace(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)
{ {
object_initialize(bus, size, typename); object_initialize(bus, size, typename);
qbus_init(bus, parent, name); qbus_init_internal(bus, parent, name);
} }
BusState *qbus_create(const char *typename, DeviceState *parent, const char *name) BusState *qbus_create(const char *typename, DeviceState *parent, const char *name)
@ -163,7 +164,7 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam
BusState *bus; BusState *bus;
bus = BUS(object_new(typename)); bus = BUS(object_new(typename));
qbus_init(bus, parent, name); qbus_init_internal(bus, parent, name);
return bus; return bus;
} }

View File

@ -340,11 +340,13 @@ static BusState *main_system_bus;
static void main_system_bus_create(void) static void main_system_bus_create(void)
{ {
/* assign main_system_bus before qbus_create_inplace() /*
* in order to make "if (bus != sysbus_get_default())" work */ * assign main_system_bus before qbus_init()
* in order to make "if (bus != sysbus_get_default())" work
*/
main_system_bus = g_malloc0(system_bus_info.instance_size); main_system_bus = g_malloc0(system_bus_info.instance_size);
qbus_create_inplace(main_system_bus, system_bus_info.instance_size, qbus_init(main_system_bus, system_bus_info.instance_size,
TYPE_SYSTEM_BUS, NULL, "main-system-bus"); TYPE_SYSTEM_BUS, NULL, "main-system-bus");
OBJECT(main_system_bus)->free = g_free; OBJECT(main_system_bus)->free = g_free;
} }

View File

@ -299,8 +299,7 @@ static void bcm2835_gpio_init(Object *obj)
DeviceState *dev = DEVICE(obj); DeviceState *dev = DEVICE(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), qbus_init(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, DEVICE(s), "sd-bus");
TYPE_SD_BUS, DEVICE(s), "sd-bus");
memory_region_init_io(&s->iomem, obj, memory_region_init_io(&s->iomem, obj,
&bcm2835_gpio_ops, s, "bcm2835_gpio", 0x1000); &bcm2835_gpio_ops, s, "bcm2835_gpio", 0x1000);

View File

@ -71,7 +71,7 @@ static const TypeInfo ide_bus_info = {
void ide_bus_new(IDEBus *idebus, size_t idebus_size, DeviceState *dev, void ide_bus_new(IDEBus *idebus, size_t idebus_size, DeviceState *dev,
int bus_id, int max_units) int bus_id, int max_units)
{ {
qbus_create_inplace(idebus, idebus_size, TYPE_IDE_BUS, dev, NULL); qbus_init(idebus, idebus_size, TYPE_IDE_BUS, dev, NULL);
idebus->bus_id = bus_id; idebus->bus_id = bus_id;
idebus->max_units = max_units; idebus->max_units = max_units;
} }

View File

@ -35,7 +35,7 @@ void ipack_bus_init(IPackBus *bus, size_t bus_size,
uint8_t n_slots, uint8_t n_slots,
qemu_irq_handler handler) qemu_irq_handler handler)
{ {
qbus_create_inplace(bus, bus_size, TYPE_IPACK_BUS, parent, NULL); qbus_init(bus, bus_size, TYPE_IPACK_BUS, parent, NULL);
bus->n_slots = n_slots; bus->n_slots = n_slots;
bus->set_irq = handler; bus->set_irq = handler;
} }

View File

@ -1038,8 +1038,8 @@ static void mos6522_q800_via1_init(Object *obj)
sysbus_init_mmio(sbd, &v1s->via_mem); sysbus_init_mmio(sbd, &v1s->via_mem);
/* ADB */ /* ADB */
qbus_create_inplace((BusState *)&v1s->adb_bus, sizeof(v1s->adb_bus), qbus_init((BusState *)&v1s->adb_bus, sizeof(v1s->adb_bus),
TYPE_ADB_BUS, DEVICE(v1s), "adb.0"); TYPE_ADB_BUS, DEVICE(v1s), "adb.0");
qdev_init_gpio_in(DEVICE(obj), via1_irq_request, VIA1_IRQ_NB); qdev_init_gpio_in(DEVICE(obj), via1_irq_request, VIA1_IRQ_NB);
} }

View File

@ -553,8 +553,8 @@ static void cuda_init(Object *obj)
memory_region_init_io(&s->mem, obj, &mos6522_cuda_ops, s, "cuda", 0x2000); memory_region_init_io(&s->mem, obj, &mos6522_cuda_ops, s, "cuda", 0x2000);
sysbus_init_mmio(sbd, &s->mem); sysbus_init_mmio(sbd, &s->mem);
qbus_create_inplace(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS, qbus_init(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS,
DEVICE(obj), "adb.0"); DEVICE(obj), "adb.0");
} }
static Property cuda_properties[] = { static Property cuda_properties[] = {

View File

@ -387,8 +387,8 @@ static void macio_instance_init(Object *obj)
memory_region_init(&s->bar, obj, "macio", 0x80000); memory_region_init(&s->bar, obj, "macio", 0x80000);
qbus_create_inplace(&s->macio_bus, sizeof(s->macio_bus), TYPE_MACIO_BUS, qbus_init(&s->macio_bus, sizeof(s->macio_bus), TYPE_MACIO_BUS,
DEVICE(obj), "macio.0"); DEVICE(obj), "macio.0");
object_initialize_child(OBJECT(s), "dbdma", &s->dbdma, TYPE_MAC_DBDMA); object_initialize_child(OBJECT(s), "dbdma", &s->dbdma, TYPE_MAC_DBDMA);

View File

@ -754,8 +754,8 @@ static void pmu_realize(DeviceState *dev, Error **errp)
timer_mod(s->one_sec_timer, s->one_sec_target); timer_mod(s->one_sec_timer, s->one_sec_target);
if (s->has_adb) { if (s->has_adb) {
qbus_create_inplace(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS, qbus_init(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS,
dev, "adb.0"); dev, "adb.0");
adb_register_autopoll_callback(adb_bus, pmu_adb_poll, s); adb_register_autopoll_callback(adb_bus, pmu_adb_poll, s);
} }
} }

View File

@ -18,7 +18,7 @@ static void nubus_bridge_init(Object *obj)
NubusBridge *s = NUBUS_BRIDGE(obj); NubusBridge *s = NUBUS_BRIDGE(obj);
NubusBus *bus = &s->bus; NubusBus *bus = &s->bus;
qbus_create_inplace(bus, sizeof(s->bus), TYPE_NUBUS_BUS, DEVICE(s), NULL); qbus_init(bus, sizeof(s->bus), TYPE_NUBUS_BUS, DEVICE(s), NULL);
qdev_init_gpio_out(DEVICE(s), bus->irqs, NUBUS_IRQS); qdev_init_gpio_out(DEVICE(s), bus->irqs, NUBUS_IRQS);
} }

View File

@ -6539,8 +6539,8 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
return; return;
} }
qbus_create_inplace(&n->bus, sizeof(NvmeBus), TYPE_NVME_BUS, qbus_init(&n->bus, sizeof(NvmeBus), TYPE_NVME_BUS,
&pci_dev->qdev, n->parent_obj.qdev.id); &pci_dev->qdev, n->parent_obj.qdev.id);
nvme_init_state(n); nvme_init_state(n);
if (nvme_init_pci(n, pci_dev, errp)) { if (nvme_init_pci(n, pci_dev, errp)) {

View File

@ -50,8 +50,7 @@ static void nvme_subsys_realize(DeviceState *dev, Error **errp)
{ {
NvmeSubsystem *subsys = NVME_SUBSYS(dev); NvmeSubsystem *subsys = NVME_SUBSYS(dev);
qbus_create_inplace(&subsys->bus, sizeof(NvmeBus), TYPE_NVME_BUS, dev, qbus_init(&subsys->bus, sizeof(NvmeBus), TYPE_NVME_BUS, dev, dev->id);
dev->id);
nvme_subsys_setup(subsys); nvme_subsys_setup(subsys);
} }

View File

@ -466,7 +466,7 @@ void pci_root_bus_init(PCIBus *bus, size_t bus_size, DeviceState *parent,
MemoryRegion *address_space_io, MemoryRegion *address_space_io,
uint8_t devfn_min, const char *typename) uint8_t devfn_min, const char *typename)
{ {
qbus_create_inplace(bus, bus_size, typename, parent, name); qbus_init(bus, bus_size, 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);
} }

View File

@ -374,8 +374,8 @@ void pci_bridge_initfn(PCIDevice *dev, const char *typename)
br->bus_name = dev->qdev.id; br->bus_name = dev->qdev.id;
} }
qbus_create_inplace(sec_bus, sizeof(br->sec_bus), typename, DEVICE(dev), qbus_init(sec_bus, sizeof(br->sec_bus), typename, DEVICE(dev),
br->bus_name); br->bus_name);
sec_bus->parent_dev = dev; sec_bus->parent_dev = dev;
sec_bus->map_irq = br->map_irq ? br->map_irq : pci_swizzle_map_irq_fn; sec_bus->map_irq = br->map_irq ? br->map_irq : pci_swizzle_map_irq_fn;
sec_bus->address_space_mem = &br->address_space_mem; sec_bus->address_space_mem = &br->address_space_mem;

View File

@ -427,8 +427,8 @@ static void init_event_facility(Object *obj)
sclp_event_set_allow_all_mask_sizes); sclp_event_set_allow_all_mask_sizes);
/* Spawn a new bus for SCLP events */ /* Spawn a new bus for SCLP events */
qbus_create_inplace(&event_facility->sbus, sizeof(event_facility->sbus), qbus_init(&event_facility->sbus, sizeof(event_facility->sbus),
TYPE_SCLP_EVENTS_BUS, sdev, NULL); TYPE_SCLP_EVENTS_BUS, sdev, NULL);
object_initialize_child(obj, TYPE_SCLP_QUIESCE, object_initialize_child(obj, TYPE_SCLP_QUIESCE,
&event_facility->quiesce, &event_facility->quiesce,

View File

@ -1261,8 +1261,7 @@ static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size,
DeviceState *qdev = DEVICE(dev); DeviceState *qdev = DEVICE(dev);
char virtio_bus_name[] = "virtio-bus"; char virtio_bus_name[] = "virtio-bus";
qbus_create_inplace(bus, bus_size, TYPE_VIRTIO_CCW_BUS, qbus_init(bus, bus_size, TYPE_VIRTIO_CCW_BUS, qdev, virtio_bus_name);
qdev, virtio_bus_name);
} }
static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data) static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data)

View File

@ -137,7 +137,7 @@ void scsi_device_unit_attention_reported(SCSIDevice *s)
void scsi_bus_init_named(SCSIBus *bus, size_t bus_size, DeviceState *host, void scsi_bus_init_named(SCSIBus *bus, size_t bus_size, DeviceState *host,
const SCSIBusInfo *info, const char *bus_name) const SCSIBusInfo *info, const char *bus_name)
{ {
qbus_create_inplace(bus, bus_size, TYPE_SCSI_BUS, host, bus_name); qbus_init(bus, bus_size, TYPE_SCSI_BUS, host, bus_name);
bus->busnr = next_scsi_bus++; bus->busnr = next_scsi_bus++;
bus->info = info; bus->info = info;
qbus_set_bus_hotplug_handler(BUS(bus)); qbus_set_bus_hotplug_handler(BUS(bus));

View File

@ -738,8 +738,8 @@ static void allwinner_sdhost_init(Object *obj)
{ {
AwSdHostState *s = AW_SDHOST(obj); AwSdHostState *s = AW_SDHOST(obj);
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), qbus_init(&s->sdbus, sizeof(s->sdbus),
TYPE_AW_SDHOST_BUS, DEVICE(s), "sd-bus"); TYPE_AW_SDHOST_BUS, DEVICE(s), "sd-bus");
memory_region_init_io(&s->iomem, obj, &allwinner_sdhost_ops, s, memory_region_init_io(&s->iomem, obj, &allwinner_sdhost_ops, s,
TYPE_AW_SDHOST, 4 * KiB); TYPE_AW_SDHOST, 4 * KiB);

View File

@ -403,8 +403,8 @@ static void bcm2835_sdhost_init(Object *obj)
{ {
BCM2835SDHostState *s = BCM2835_SDHOST(obj); BCM2835SDHostState *s = BCM2835_SDHOST(obj);
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), qbus_init(&s->sdbus, sizeof(s->sdbus),
TYPE_BCM2835_SDHOST_BUS, DEVICE(s), "sd-bus"); TYPE_BCM2835_SDHOST_BUS, DEVICE(s), "sd-bus");
memory_region_init_io(&s->iomem, obj, &bcm2835_sdhost_ops, s, memory_region_init_io(&s->iomem, obj, &bcm2835_sdhost_ops, s,
TYPE_BCM2835_SDHOST, 0x1000); TYPE_BCM2835_SDHOST, 0x1000);

View File

@ -506,8 +506,7 @@ static void pl181_init(Object *obj)
qdev_init_gpio_out_named(dev, &s->card_readonly, "card-read-only", 1); qdev_init_gpio_out_named(dev, &s->card_readonly, "card-read-only", 1);
qdev_init_gpio_out_named(dev, &s->card_inserted, "card-inserted", 1); qdev_init_gpio_out_named(dev, &s->card_inserted, "card-inserted", 1);
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), qbus_init(&s->sdbus, sizeof(s->sdbus), TYPE_PL181_BUS, dev, "sd-bus");
TYPE_PL181_BUS, dev, "sd-bus");
} }
static void pl181_class_init(ObjectClass *klass, void *data) static void pl181_class_init(ObjectClass *klass, void *data)

View File

@ -560,8 +560,8 @@ static void pxa2xx_mmci_instance_init(Object *obj)
qdev_init_gpio_out_named(dev, &s->rx_dma, "rx-dma", 1); qdev_init_gpio_out_named(dev, &s->rx_dma, "rx-dma", 1);
qdev_init_gpio_out_named(dev, &s->tx_dma, "tx-dma", 1); qdev_init_gpio_out_named(dev, &s->tx_dma, "tx-dma", 1);
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), qbus_init(&s->sdbus, sizeof(s->sdbus),
TYPE_PXA2XX_MMCI_BUS, DEVICE(obj), "sd-bus"); TYPE_PXA2XX_MMCI_BUS, DEVICE(obj), "sd-bus");
} }
static void pxa2xx_mmci_class_init(ObjectClass *klass, void *data) static void pxa2xx_mmci_class_init(ObjectClass *klass, void *data)

View File

@ -1337,8 +1337,7 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp)
void sdhci_initfn(SDHCIState *s) void sdhci_initfn(SDHCIState *s)
{ {
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), qbus_init(&s->sdbus, sizeof(s->sdbus), TYPE_SDHCI_BUS, DEVICE(s), "sd-bus");
TYPE_SDHCI_BUS, DEVICE(s), "sd-bus");
s->insert_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_raise_insertion_irq, s); s->insert_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_raise_insertion_irq, s);
s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s); s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s);

View File

@ -373,8 +373,7 @@ static void ssi_sd_realize(SSIPeripheral *d, Error **errp)
DeviceState *carddev; DeviceState *carddev;
DriveInfo *dinfo; DriveInfo *dinfo;
qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, qbus_init(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, DEVICE(d), "sd-bus");
DEVICE(d), "sd-bus");
/* Create and plug in the sd card */ /* Create and plug in the sd card */
/* FIXME use a qdev drive property instead of drive_get_next() */ /* FIXME use a qdev drive property instead of drive_get_next() */

View File

@ -82,7 +82,7 @@ const VMStateDescription vmstate_usb_device = {
void usb_bus_new(USBBus *bus, size_t bus_size, void usb_bus_new(USBBus *bus, size_t bus_size,
USBBusOps *ops, DeviceState *host) USBBusOps *ops, DeviceState *host)
{ {
qbus_create_inplace(bus, bus_size, TYPE_USB_BUS, host, NULL); qbus_init(bus, bus_size, TYPE_USB_BUS, host, NULL);
qbus_set_bus_hotplug_handler(BUS(bus)); qbus_set_bus_hotplug_handler(BUS(bus));
bus->ops = ops; bus->ops = ops;
bus->busnr = next_usb_bus++; bus->busnr = next_usb_bus++;

View File

@ -1320,8 +1320,7 @@ static void ccid_realize(USBDevice *dev, Error **errp)
usb_desc_create_serial(dev); usb_desc_create_serial(dev);
usb_desc_init(dev); usb_desc_init(dev);
qbus_create_inplace(&s->bus, sizeof(s->bus), TYPE_CCID_BUS, DEVICE(dev), qbus_init(&s->bus, sizeof(s->bus), TYPE_CCID_BUS, DEVICE(dev), NULL);
NULL);
qbus_set_hotplug_handler(BUS(&s->bus), OBJECT(dev)); qbus_set_hotplug_handler(BUS(&s->bus), OBJECT(dev));
s->intr = usb_ep_get(dev, USB_TOKEN_IN, CCID_INT_IN_EP); s->intr = usb_ep_get(dev, USB_TOKEN_IN, CCID_INT_IN_EP);
s->bulk = usb_ep_get(dev, USB_TOKEN_IN, CCID_BULK_IN_EP); s->bulk = usb_ep_get(dev, USB_TOKEN_IN, CCID_BULK_IN_EP);

View File

@ -733,8 +733,7 @@ static void virtio_mmio_realizefn(DeviceState *d, Error **errp)
VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d); VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d);
SysBusDevice *sbd = SYS_BUS_DEVICE(d); SysBusDevice *sbd = SYS_BUS_DEVICE(d);
qbus_create_inplace(&proxy->bus, sizeof(proxy->bus), TYPE_VIRTIO_MMIO_BUS, qbus_init(&proxy->bus, sizeof(proxy->bus), TYPE_VIRTIO_MMIO_BUS, d, NULL);
d, NULL);
sysbus_init_irq(sbd, &proxy->irq); sysbus_init_irq(sbd, &proxy->irq);
if (!kvm_eventfds_enabled()) { if (!kvm_eventfds_enabled()) {

View File

@ -2187,8 +2187,7 @@ static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size,
DeviceState *qdev = DEVICE(dev); DeviceState *qdev = DEVICE(dev);
char virtio_bus_name[] = "virtio-bus"; char virtio_bus_name[] = "virtio-bus";
qbus_create_inplace(bus, bus_size, TYPE_VIRTIO_PCI_BUS, qdev, qbus_init(bus, bus_size, TYPE_VIRTIO_PCI_BUS, qdev, virtio_bus_name);
virtio_bus_name);
} }
static void virtio_pci_bus_class_init(ObjectClass *klass, void *data) static void virtio_pci_bus_class_init(ObjectClass *klass, void *data)

View File

@ -678,8 +678,8 @@ DeviceState *qdev_find_recursive(BusState *bus, const char *id);
typedef int (qbus_walkerfn)(BusState *bus, void *opaque); typedef int (qbus_walkerfn)(BusState *bus, void *opaque);
typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque); typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);
void qbus_create_inplace(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_create(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);