diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:35:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:35:16 -0500 |
| commit | 8aca521512a14c439624191bd0a891c52f91b401 (patch) | |
| tree | 9b6c433f73234ad3ce375ce5fb4829db2e409279 /hw/pci_bridge.c | |
| parent | 664535c31c41d8dcd7756b579674a4a6f9eb6cd9 (diff) | |
| parent | 89bfe000433a601d30729086e88519ff36b85103 (diff) | |
| download | qemu-8aca521512a14c439624191bd0a891c52f91b401.tar.gz qemu-8aca521512a14c439624191bd0a891c52f91b401.tar.bz2 qemu-8aca521512a14c439624191bd0a891c52f91b401.zip | |
Merge remote-tracking branch 'afaerber-or/qom-next-2' into staging
* afaerber-or/qom-next-2: (22 commits)
qom: Push error reporting to object_property_find()
qdev: Remove qdev_prop_exists()
qbus: Initialize in standard way
qbus: Make child devices links
qdev: Connect busses with their parent devices
qdev: Convert busses to QEMU Object Model
qdev: Move SysBus initialization to sysbus.c
qdev: Use wrapper for qdev_get_path
qdev: Remove qdev_prop_set_defaults
qdev: Clean up global properties
qdev: Move bus properties to abstract superclasses
qdev: Move bus properties to a separate global
qdev: Push "type" property up to Object
arm_l2x0: Rename "type" property to "cache-type"
m48t59: Rename "type" property to "model"
qom: Assert that public types have a non-NULL parent field
qom: Drop type_register_static_alias() macro
qom: Make Object a type
qom: Add class_base_init
qom: Add object_child_foreach()
...
Diffstat (limited to 'hw/pci_bridge.c')
| -rw-r--r-- | hw/pci_bridge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index e0832b4a67..0916276c4d 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -318,7 +318,7 @@ int pci_bridge_initfn(PCIDevice *dev) br->bus_name = dev->qdev.id; } - qbus_create_inplace(&sec_bus->qbus, &pci_bus_info, &dev->qdev, + qbus_create_inplace(&sec_bus->qbus, TYPE_PCI_BUS, &dev->qdev, br->bus_name); sec_bus->parent_dev = dev; sec_bus->map_irq = br->map_irq; |