From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCWM-0000Fm-Mv for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:30:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaCWL-0002ND-RQ for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:30:46 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:49839 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCWL-0002N0-KP for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:30:45 -0500 From: Anthony Liguori Date: Mon, 12 Dec 2011 14:29:38 -0600 Message-Id: <1323721784-704-15-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1323721784-704-1-git-send-email-aliguori@us.ibm.com> References: <1323721784-704-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH v3 14/20] rtc: make piix3 set the rtc as a child (v2) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino Signed-off-by: Anthony Liguori --- 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