From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyK-0001wf-IB for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIQyH-0001Y7-PH for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:12 -0400 Received: from smtp23.services.sfr.fr ([93.17.128.19]:57951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyH-0001Xx-EH for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:09 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 24 Oct 2011 22:18:18 +0200 Message-Id: <1319487505-5915-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1319487505-5915-1-git-send-email-hpoussin@reactos.org> References: <1319487505-5915-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 04/11] pc: give ISA bus to ISA methods List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/pc.h | 2 +- hw/pc_piix.c | 3 +-- hw/piix_pci.c | 8 +++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index c43fa73..127940c 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -181,7 +181,7 @@ struct PCII440FXState; typedef struct PCII440FXState PCII440FXState; =20 PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, - qemu_irq *pic, + ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, ram_addr_t ram_size, diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 6bc1f60..be91d3b 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -135,7 +135,7 @@ static void pc_init1(MemoryRegion *system_memory, gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); =20 if (pci_enabled) { - pci_bus =3D i440fx_init(&i440fx_state, &piix3_devfn, gsi, + pci_bus =3D i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, g= si, system_memory, system_io, ram_size, below_4g_mem_size, 0x100000000ULL - below_4g_mem_size, @@ -144,7 +144,6 @@ static void pc_init1(MemoryRegion *system_memory, ? 0 : ((uint64_t)1 << 62)), pci_memory, ram_memory); - isa_bus =3D NULL; } else { pci_bus =3D NULL; i440fx_state =3D NULL; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index d183443..aef2d7f 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -263,7 +263,7 @@ static int i440fx_initfn(PCIDevice *dev) static PCIBus *i440fx_common_init(const char *device_name, PCII440FXState **pi440fx_state, int *piix3_devfn, - qemu_irq *pic, + ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, ram_addr_t ram_size, @@ -325,6 +325,8 @@ static PCIBus *i440fx_common_init(const char *device_= name, PIIX_NUM_PIRQS); } piix3->pic =3D pic; + *isa_bus =3D DO_UPCAST(ISABus, qbus, + qdev_get_child_bus(&piix3->dev.qdev, "isa.0")); =20 (*pi440fx_state)->piix3 =3D piix3; =20 @@ -341,7 +343,7 @@ static PCIBus *i440fx_common_init(const char *device_= name, } =20 PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, - qemu_irq *pic, + ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, ram_addr_t ram_size, @@ -354,7 +356,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, i= nt *piix3_devfn, { PCIBus *b; =20 - b =3D i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, pic, + b =3D i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, isa_b= us, pic, address_space_mem, address_space_io, ram_size= , pci_hole_start, pci_hole_size, pci_hole64_size, pci_hole64_size, --=20 1.7.6.3