diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-06-30 14:12:11 +0200 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-07-09 13:07:03 +0100 |
| commit | 16eaedf2668e9b347a59d73346fcc4c764c58348 (patch) | |
| tree | 49434e9d18142475fde85622b1169230391389b0 /hw/pci.c | |
| parent | 042f84d0af0e6c654d836f57ce916d7dec2b263d (diff) | |
| download | focaccia-qemu-16eaedf2668e9b347a59d73346fcc4c764c58348.tar.gz focaccia-qemu-16eaedf2668e9b347a59d73346fcc4c764c58348.zip | |
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>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/pci.c b/hw/pci.c index f4c749483e..71d9227a2e 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); |