aboutsummaryrefslogtreecommitdiff
path: root/hw/sh_pci.c
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-23 00:05:19 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-23 00:13:41 +0100
commit02e2da45c4601909d5105838323d5c529ec7010b (patch)
treee9b1099baa55c3f8084110feb28f57ede8d2de3a /hw/sh_pci.c
parent4856fcff8af1ba349baaf063af00f5e5d87a99f4 (diff)
downloadqemu-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/sh_pci.c')
-rw-r--r--hw/sh_pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index 3f79b10..2ec4b43 100644
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -174,7 +174,8 @@ PCIBus *sh_pci_register_bus(pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
int mem, reg, iop;
p = qemu_mallocz(sizeof(SHPCIC));
- p->bus = pci_register_bus(set_irq, map_irq, pic, devfn_min, nirq);
+ p->bus = pci_register_bus(NULL, "pci",
+ set_irq, map_irq, pic, devfn_min, nirq);
p->dev = pci_register_device(p->bus, "SH PCIC", sizeof(PCIDevice),
-1, NULL, NULL);