From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ra8vK-0003bo-CR for qemu-devel@nongnu.org; Mon, 12 Dec 2011 11:40:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ra8vH-0001Ad-DO for qemu-devel@nongnu.org; Mon, 12 Dec 2011 11:40:18 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:57882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ra8vH-00010h-7O for qemu-devel@nongnu.org; Mon, 12 Dec 2011 11:40:15 -0500 Received: by mail-iy0-f173.google.com with SMTP id j37so2907245iag.4 for ; Mon, 12 Dec 2011 08:40:15 -0800 (PST) Message-ID: <4EE62E6B.5020104@codemonkey.ws> Date: Mon, 12 Dec 2011 10:40:11 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1319487505-5915-1-git-send-email-hpoussin@reactos.org> <1319487505-5915-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1319487505-5915-5-git-send-email-hpoussin@reactos.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [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: =?UTF-8?B?SGVydsOpIFBvdXNzaW5lYXU=?= Cc: qemu-devel@nongnu.org On 10/24/2011 03:18 PM, Hervé Poussineau wrote: > > Signed-off-by: Hervé Poussineau Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > 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; > > 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 = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); > > if (pci_enabled) { > - pci_bus = i440fx_init(&i440fx_state,&piix3_devfn, gsi, > + pci_bus = i440fx_init(&i440fx_state,&piix3_devfn,&isa_bus, gsi, > 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 = NULL; > } else { > pci_bus = NULL; > i440fx_state = 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 = pic; > + *isa_bus = DO_UPCAST(ISABus, qbus, > + qdev_get_child_bus(&piix3->dev.qdev, "isa.0")); > > (*pi440fx_state)->piix3 = piix3; > > @@ -341,7 +343,7 @@ static PCIBus *i440fx_common_init(const char *device_name, > } > > 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, int *piix3_devfn, > { > PCIBus *b; > > - b = i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, pic, > + b = i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, isa_bus, pic, > address_space_mem, address_space_io, ram_size, > pci_hole_start, pci_hole_size, > pci_hole64_size, pci_hole64_size,