diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-30 08:55:55 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-03 10:41:08 -0600 |
| commit | 57c9fafe0f759c9f1efa5451662b3627f9bb95e0 (patch) | |
| tree | 6a097cdea9a82e94cbd696a45e3e5faac917881b /hw/piix_pci.c | |
| parent | 0beb4942071e385c16deba03848898865842edc7 (diff) | |
| download | qemu-57c9fafe0f759c9f1efa5451662b3627f9bb95e0.zip qemu-57c9fafe0f759c9f1efa5451662b3627f9bb95e0.tar.gz qemu-57c9fafe0f759c9f1efa5451662b3627f9bb95e0.tar.bz2 | |
qom: move properties from qdev to object
This is mostly code movement although not entirely. This makes properties part
of the Object base class which means that we can now start using Object in a
meaningful way outside of qdev.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/piix_pci.c')
| -rw-r--r-- | hw/piix_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 2bbfa4a..1906427 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -277,7 +277,7 @@ static PCIBus *i440fx_common_init(const char *device_name, address_space_io, 0); s->bus = b; qdev_init_nofail(dev); - qdev_property_add_child(qdev_get_root(), "i440fx", dev, NULL); + object_property_add_child(object_get_root(), "i440fx", OBJECT(dev), NULL); d = pci_create_simple(b, 0, device_name); *pi440fx_state = DO_UPCAST(PCII440FXState, dev, d); @@ -316,7 +316,7 @@ static PCIBus *i440fx_common_init(const char *device_name, pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, PIIX_NUM_PIRQS); } - qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL); + 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")); |