From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbYNB-0000fr-Vq for qemu-devel@nongnu.org; Fri, 16 Dec 2011 09:02:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbYN3-0003LR-MF for qemu-devel@nongnu.org; Fri, 16 Dec 2011 09:02:53 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:37939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbYN3-0003LN-Gk for qemu-devel@nongnu.org; Fri, 16 Dec 2011 09:02:45 -0500 Received: by iagj37 with SMTP id j37so5025704iag.4 for ; Fri, 16 Dec 2011 06:02:45 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 16 Dec 2011 15:02:04 +0100 Message-Id: <1324044124-4786-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] i440fx: clean up List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Add the piix3 child also in the Xen case. Drop the unused piix3 field from PCII440FXState. Signed-off-by: Paolo Bonzini --- hw/piix_pci.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index d785d4b..8d106a8 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -82,7 +82,6 @@ struct PCII440FXState { MemoryRegion smram_region; uint8_t smm_enabled; bool smram_enabled; - PIIX3State *piix3; }; @@ -324,12 +323,11 @@ 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; - (*pi440fx_state)->piix3 = piix3; + qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL); + + piix3->pic = pic; *piix3_devfn = piix3->dev.devfn; -- 1.7.7.1