mirror of https://gitee.com/openkylin/qemu.git
qdev/pci: misc fixes.
* fix secondary bus setup. * use base->name instead of "FIXME" for device name. Yes, the device name is redundant. Only for drivers converted to qdev already though. Once all drivers are converted we can and should kill it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
042f84d0af
commit
16eaedf266
5
hw/pci.c
5
hw/pci.c
|
@ -134,7 +134,8 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name,
|
|||
static PCIBus *pci_register_secondary_bus(PCIDevice *dev, pci_map_irq_fn map_irq)
|
||||
{
|
||||
PCIBus *bus;
|
||||
bus = qemu_mallocz(sizeof(PCIBus));
|
||||
|
||||
bus = FROM_QBUS(PCIBus, qbus_create(&pci_bus_info, &dev->qdev, NULL));
|
||||
bus->map_irq = map_irq;
|
||||
bus->parent_dev = dev;
|
||||
bus->next = dev->bus->next;
|
||||
|
@ -890,7 +891,7 @@ static void pci_qdev_init(DeviceState *qdev, DeviceInfo *base)
|
|||
|
||||
bus = FROM_QBUS(PCIBus, qdev_get_parent_bus(qdev));
|
||||
devfn = qdev_get_prop_int(qdev, "devfn", -1);
|
||||
pci_dev = do_pci_register_device(pci_dev, bus, "FIXME", devfn,
|
||||
pci_dev = do_pci_register_device(pci_dev, bus, base->name, devfn,
|
||||
info->config_read, info->config_write);
|
||||
assert(pci_dev);
|
||||
info->init(pci_dev);
|
||||
|
|
Loading…
Reference in New Issue