SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipack: Rename ipack_bus_new_inplace() to ipack_bus_init()

Browse Source 
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:
Peter Maydell 2021-09-23 13:11:49 +01:00
parent 739e95f574
commit 43417c0c27
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ipack/ipack.c
View File

@ -30,12 +30,12 @@ IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
return NULL; return NULL;
} }
void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size, void ipack_bus_init(IPackBus *bus, size_t bus_size,
DeviceState *parent, DeviceState *parent,
const char *name, 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, name); qbus_create_inplace(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;
} }

4
hw/ipack/tpci200.c
View File

@ -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, 4, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las2);
pci_register_bar(&s->dev, 5, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las3); 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, ipack_bus_init(&s->bus, sizeof(s->bus), DEVICE(pci_dev),
N_MODULES, tpci200_set_irq); N_MODULES, tpci200_set_irq);
} }
static const VMStateDescription vmstate_tpci200 = { static const VMStateDescription vmstate_tpci200 = {

8
include/hw/ipack/ipack.h
View File

@ -73,9 +73,9 @@ extern const VMStateDescription vmstate_ipack_device;
VMSTATE_STRUCT(_field, _state, 1, vmstate_ipack_device, IPackDevice) VMSTATE_STRUCT(_field, _state, 1, vmstate_ipack_device, IPackDevice)
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot); IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot);
void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size, void ipack_bus_init(IPackBus *bus, size_t bus_size,
DeviceState *parent, DeviceState *parent,
const char *name, uint8_t n_slots, uint8_t n_slots,
qemu_irq_handler handler); qemu_irq_handler handler);
#endif #endif