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/pc_piix.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/pc_piix.c')
-rw-r--r-- | hw/pc_piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index a285ad2..c06f1b5 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -229,7 +229,7 @@ static void pc_init1(MemoryRegion *system_memory, dev = pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL); if (dev) { - qdev_property_add_child(qdev_get_root(), "vga", dev, NULL); + object_property_add_child(object_get_root(), "vga", OBJECT(dev), NULL); } if (xen_enabled()) { @@ -267,8 +267,8 @@ static void pc_init1(MemoryRegion *system_memory, * For now, let's "fix" this by making judicious use of paths. This * is not generally the right way to do this. */ - qdev_property_add_child(qdev_resolve_path("/i440fx/piix3", NULL), - "rtc", (DeviceState *)rtc_state, NULL); + object_property_add_child(object_resolve_path("/i440fx/piix3", NULL), + "rtc", (Object *)rtc_state, NULL); } else { for(i = 0; i < MAX_IDE_BUS; i++) { ISADevice *dev; |