[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/18] rtc: make piix3 set the rtc as a child (v2
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH v2 14/18] rtc: make piix3 set the rtc as a child (v2) |
Date: |
Fri, 2 Dec 2011 14:20:52 -0600 |
Signed-off-by: Anthony Liguori <address@hidden>
---
v1 -> v2
- comments (Stefan)
---
hw/pc_piix.c | 11 +++++++++++
hw/piix_pci.c | 3 +++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 970f43c..2d5ea2c 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -205,6 +205,17 @@ static void pc_init1(MemoryRegion *system_memory,
}
}
+ /* FIXME there's some major spaghetti here. Somehow we create the devices
+ * on the PIIX before we actually create it. We create the PIIX3 deep in
+ * the recess of the i440fx creation too and then lose the DeviceState.
+ *
+ * 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);
+
audio_init(gsi, pci_enabled ? pci_bus : NULL);
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index d183443..d785d4b 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -288,6 +288,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);
d = pci_create_simple(b, 0, device_name);
*pi440fx_state = DO_UPCAST(PCII440FXState, dev, d);
@@ -323,6 +324,8 @@ static PCIBus *i440fx_common_init(const char *device_name,
pci_create_simple_multifunction(b, -1, true, "PIIX3"));
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);
}
piix3->pic = pic;
--
1.7.4.1
- [Qemu-devel] [PATCH v2 06/18] qdev: provide a path resolution (v2), (continued)
- [Qemu-devel] [PATCH v2 06/18] qdev: provide a path resolution (v2), Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 08/18] qom: add link properties (v2), Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 10/18] qmp: add qom-list command, Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 13/18] dev: add an anonymous peripheral container, Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 12/18] qdev: add explicitly named devices to the root complex, Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 09/18] qapi: allow a 'gen' key to suppress code generation, Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 14/18] rtc: make piix3 set the rtc as a child (v2),
Anthony Liguori <=
- [Qemu-devel] [PATCH v2 16/18] qom: optimize qdev_get_canonical_path using a parent link, Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 18/18] qom: add test tools (v2), Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 17/18] qmp: make qmp.py easier to use, Anthony Liguori, 2011/12/02
- [Qemu-devel] [PATCH v2 15/18] rtc: add a dynamic property for retrieving the date, Anthony Liguori, 2011/12/02