ipack: Rename ipack_bus_new_inplace() to ipack_bus_init()
Rename ipack_bus_new_inplace() to ipack_bus_init(), to bring it in to line with a "_init for in-place init, _new for allocate-and-return" convention. Drop the 'name' argument, because the only caller does not pass in a name. If a future caller does need to specify the bus name, we should create an ipack_bus_init_named() function at that point. 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-3-peter.maydell@linaro.org
This commit is contained in:
parent
739e95f574
commit
43417c0c27
@ -30,12 +30,12 @@ IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size,
|
||||
DeviceState *parent,
|
||||
const char *name, uint8_t n_slots,
|
||||
qemu_irq_handler handler)
|
||||
void ipack_bus_init(IPackBus *bus, size_t bus_size,
|
||||
DeviceState *parent,
|
||||
uint8_t n_slots,
|
||||
qemu_irq_handler handler)
|
||||
{
|
||||
qbus_create_inplace(bus, bus_size, TYPE_IPACK_BUS, parent, name);
|
||||
qbus_create_inplace(bus, bus_size, TYPE_IPACK_BUS, parent, NULL);
|
||||
bus->n_slots = n_slots;
|
||||
bus->set_irq = handler;
|
||||
}
|
||||
|
@ -611,8 +611,8 @@ static void tpci200_realize(PCIDevice *pci_dev, Error **errp)
|
||||
pci_register_bar(&s->dev, 4, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las2);
|
||||
pci_register_bar(&s->dev, 5, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las3);
|
||||
|
||||
ipack_bus_new_inplace(&s->bus, sizeof(s->bus), DEVICE(pci_dev), NULL,
|
||||
N_MODULES, tpci200_set_irq);
|
||||
ipack_bus_init(&s->bus, sizeof(s->bus), DEVICE(pci_dev),
|
||||
N_MODULES, tpci200_set_irq);
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_tpci200 = {
|
||||
|
@ -73,9 +73,9 @@ extern const VMStateDescription vmstate_ipack_device;
|
||||
VMSTATE_STRUCT(_field, _state, 1, vmstate_ipack_device, IPackDevice)
|
||||
|
||||
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot);
|
||||
void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size,
|
||||
DeviceState *parent,
|
||||
const char *name, uint8_t n_slots,
|
||||
qemu_irq_handler handler);
|
||||
void ipack_bus_init(IPackBus *bus, size_t bus_size,
|
||||
DeviceState *parent,
|
||||
uint8_t n_slots,
|
||||
qemu_irq_handler handler);
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user