diff mbox

[13/18] rtc: make piix3 set the rtc as a child

Message ID 1322687028-29714-14-git-send-email-aliguori@us.ibm.com
State New
Headers show

Commit Message

Anthony Liguori Nov. 30, 2011, 9:03 p.m. UTC 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/pc_piix.c  |   11 +++++++++++
 hw/piix_pci.c |    3 +++
 2 files changed, 14 insertions(+), 0 deletions(-)

Comments

Stefan Hajnoczi Dec. 1, 2011, 11:07 a.m. UTC | #1 
On Wed, Nov 30, 2011 at 03:03:43PM -0600, Anthony Liguori wrote:
> +    /* 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 loose the DeviceState.

s/loose/lose/
Anthony Liguori Dec. 1, 2011, 1:35 p.m. UTC | #2 
On 12/01/2011 05:07 AM, Stefan Hajnoczi wrote:
> On Wed, Nov 30, 2011 at 03:03:43PM -0600, Anthony Liguori wrote:
>> +    /* 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 loose the DeviceState.
>
> s/loose/lose/

Ack.

Regards,

Anthony Liguori
diff mbox

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 970f43c..81d65a9 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 loose 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;