diff options
| author | Paul Brook | 2009-05-23 01:05:19 +0200 |
|---|---|---|
| committer | Paul Brook | 2009-05-23 01:13:41 +0200 |
| commit | 02e2da45c4601909d5105838323d5c529ec7010b (patch) | |
| tree | e9b1099baa55c3f8084110feb28f57ede8d2de3a /hw/unin_pci.c | |
| parent | Fix lance segfaults (diff) | |
| download | qemu-02e2da45c4601909d5105838323d5c529ec7010b.tar.gz qemu-02e2da45c4601909d5105838323d5c529ec7010b.tar.xz qemu-02e2da45c4601909d5105838323d5c529ec7010b.zip | |
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/unin_pci.c')
| -rw-r--r-- | hw/unin_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/unin_pci.c b/hw/unin_pci.c index b9c1821d82..a9ef217338 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -175,7 +175,8 @@ PCIBus *pci_pmac_init(qemu_irq *pic) /* Use values found on a real PowerMac */ /* Uninorth main bus */ s = qemu_mallocz(sizeof(UNINState)); - s->bus = pci_register_bus(pci_unin_set_irq, pci_unin_map_irq, + s->bus = pci_register_bus(NULL, "pci", + pci_unin_set_irq, pci_unin_map_irq, pic, 11 << 3, 4); pci_mem_config = cpu_register_io_memory(0, pci_unin_main_config_read, |