From 8c7352e34aebcbce8b97798ef8ca4c6bdb471cdf Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 30 Jun 2009 14:12:11 +0200 Subject: [PATCH] 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 --- hw/pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index f4c7494..71d9227 100644 --- a/hw/pci.c +++ b/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); -- 2.7.4