diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-23 00:05:19 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-23 00:13:41 +0100 |
| commit | 02e2da45c4601909d5105838323d5c529ec7010b (patch) | |
| tree | e9b1099baa55c3f8084110feb28f57ede8d2de3a /hw/versatile_pci.c | |
| parent | 4856fcff8af1ba349baaf063af00f5e5d87a99f4 (diff) | |
Add common BusState
Implement and use a common device bus state. The main side-effect is
that creating a bus and attaching it to a parent device are no longer
separate operations. For legacy code we allow a NULL parent, but that
should go away eventually.
Also tweak creation code to veriry theat a device in on the right bus.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/versatile_pci.c')
| -rw-r--r-- | hw/versatile_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index 720742c0e0..e454d498d7 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -118,9 +118,9 @@ static void pci_vpb_init(SysBusDevice *dev) for (i = 0; i < 4; i++) { sysbus_init_irq(dev, &s->irq[i]); } - bus = pci_register_bus(pci_vpb_set_irq, pci_vpb_map_irq, s->irq, + bus = pci_register_bus(&dev->qdev, "pci", + pci_vpb_set_irq, pci_vpb_map_irq, s->irq, 11 << 3, 4); - qdev_attach_child_bus(&dev->qdev, "pci", bus); /* ??? Register memory space. */ |