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/pci.h | |
| parent | 4856fcff8af1ba349baaf063af00f5e5d87a99f4 (diff) | |
| download | focaccia-qemu-02e2da45c4601909d5105838323d5c529ec7010b.tar.gz focaccia-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/pci.h')
| -rw-r--r-- | hw/pci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pci.h b/hw/pci.h index 09f9799dcd..0405837f73 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -183,7 +183,8 @@ int pci_device_load(PCIDevice *s, QEMUFile *f); typedef void (*pci_set_irq_fn)(qemu_irq *pic, int irq_num, int level); typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int irq_num); -PCIBus *pci_register_bus(pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, +PCIBus *pci_register_bus(DeviceState *parent, const char *name, + pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, qemu_irq *pic, int devfn_min, int nirq); PCIDevice *pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn, |