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/apb_pci.c | |
| parent | 4856fcff8af1ba349baaf063af00f5e5d87a99f4 (diff) | |
| download | qemu-02e2da45c4601909d5105838323d5c529ec7010b.zip qemu-02e2da45c4601909d5105838323d5c529ec7010b.tar.gz qemu-02e2da45c4601909d5105838323d5c529ec7010b.tar.bz2 | |
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/apb_pci.c')
| -rw-r--r-- | hw/apb_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index d6ce9f4..dac5cd3 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -231,7 +231,8 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, s = qemu_mallocz(sizeof(APBState)); /* Ultrasparc PBM main bus */ - s->bus = pci_register_bus(pci_apb_set_irq, pci_pbm_map_irq, pic, 0, 32); + s->bus = pci_register_bus(NULL, "pci", + pci_apb_set_irq, pci_pbm_map_irq, pic, 0, 32); pci_mem_config = cpu_register_io_memory(0, pci_apb_config_read, pci_apb_config_write, s); |