aboutsummaryrefslogtreecommitdiff
path: root/hw/piix_pci.c
diff options
context:
space:
mode:
authorJulian Pidancet <julian.pidancet@gmail.com>2011-12-18 18:08:44 +0000
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-12-19 10:52:14 +0000
commit8ceb49fe4597e643aab5308b38f84de5d13a39b4 (patch)
tree1106724099097c9c03de3a55a42b707e188efcf7 /hw/piix_pci.c
parentb15ba6c95147e62671b29580c3b9056773cc496e (diff)
downloadqemu-8ceb49fe4597e643aab5308b38f84de5d13a39b4.zip
qemu-8ceb49fe4597e643aab5308b38f84de5d13a39b4.tar.gz
qemu-8ceb49fe4597e643aab5308b38f84de5d13a39b4.tar.bz2
Also create piix3 property when Xen is enabled
This recently added line in hw/pc_piix.c is causing a SEGV on a Xen setup because the piix3 property is never created: qdev_property_add_child(qdev_resolve_path("/i440fx/piix3", NULL), "rtc", (DeviceState *)rtc_state, NULL); Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'hw/piix_pci.c')
-rw-r--r--hw/piix_pci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index d785d4b..ea156a9 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -324,9 +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);
}
+ qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL);
piix3->pic = pic;
(*pi440fx_state)->piix3 = piix3;