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/gt64xxx.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/gt64xxx.c')
| -rw-r--r-- | hw/gt64xxx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 7fc91dd4a2..ce3ffe26bd 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -1128,7 +1128,8 @@ PCIBus *pci_gt64120_init(qemu_irq *pic) s = qemu_mallocz(sizeof(GT64120State)); s->pci = qemu_mallocz(sizeof(GT64120PCIState)); - s->pci->bus = pci_register_bus(pci_gt64120_set_irq, pci_gt64120_map_irq, + s->pci->bus = pci_register_bus(NULL, "pci", + pci_gt64120_set_irq, pci_gt64120_map_irq, pic, 144, 4); s->ISD_handle = cpu_register_io_memory(0, gt64120_read, gt64120_write, s); d = pci_register_device(s->pci->bus, "GT64120 PCI Bus", sizeof(PCIDevice), |