diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-03-27 18:38:46 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-02 15:04:15 -0500 |
| commit | f424d5c4c9de67b56594384eac3c08dc33de9344 (patch) | |
| tree | 0559a455e18c7b0cd342c33e11474702685dca1e /hw/piix_pci.c | |
| parent | a612b2a6635fa1a3a29a8bcf41b31f1f3fae1110 (diff) | |
| download | qemu-f424d5c4c9de67b56594384eac3c08dc33de9344.zip qemu-f424d5c4c9de67b56594384eac3c08dc33de9344.tar.gz qemu-f424d5c4c9de67b56594384eac3c08dc33de9344.tar.bz2 | |
qdev: add children before qdev_init
We want the composition tree to to be in order by the time we call
qdev_init, so that a single set of the toplevel realize property can
propagate all the way down the composition tree.
This is not the case so far. Unfortunately, this is incompatible
with calling qdev_init in the constructor wrappers for devices,
so for now we need to unattach some devices that are created through
those wrappers. This will be fixed by removing qdev_init and instead
setting the toplevel realize property after machine init.
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/piix_pci.c')
| -rw-r--r-- | hw/piix_pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c index e0268fe..9017565 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -276,8 +276,8 @@ static PCIBus *i440fx_common_init(const char *device_name, b = pci_bus_new(&s->busdev.qdev, NULL, pci_address_space, address_space_io, 0); s->bus = b; - qdev_init_nofail(dev); object_property_add_child(object_get_root(), "i440fx", OBJECT(dev), NULL); + qdev_init_nofail(dev); d = pci_create_simple(b, 0, device_name); *pi440fx_state = DO_UPCAST(PCII440FXState, dev, d); @@ -316,7 +316,6 @@ static PCIBus *i440fx_common_init(const char *device_name, pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, PIIX_NUM_PIRQS); } - object_property_add_child(OBJECT(dev), "piix3", OBJECT(piix3), NULL); piix3->pic = pic; *isa_bus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&piix3->dev.qdev, "isa.0")); |