From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcbAM-0000ZB-Je for qemu-devel@nongnu.org; Mon, 19 Dec 2011 06:14:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RcbAL-0002O5-E3 for qemu-devel@nongnu.org; Mon, 19 Dec 2011 06:13:58 -0500 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:38320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcbAL-0002NU-4t for qemu-devel@nongnu.org; Mon, 19 Dec 2011 06:13:57 -0500 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 19 Dec 2011 11:13:56 -0000 Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBJBDrrn1749148 for ; Mon, 19 Dec 2011 11:13:53 GMT Received: from d06av06.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBJBDjCg026005 for ; Mon, 19 Dec 2011 04:13:45 -0700 From: Stefan Hajnoczi Date: Mon, 19 Dec 2011 11:12:27 +0000 Message-Id: <1324293158-25433-7-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1324293158-25433-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1324293158-25433-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 06/17] Also create piix3 property when Xen is enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Stefan Hajnoczi , Julian Pidancet From: Julian Pidancet 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 Signed-off-by: Stefan Hajnoczi --- hw/piix_pci.c | 3 +-- 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; -- 1.7.7.3