qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 04/11] pc: give ISA bus to ISA methods


From: Anthony Liguori
Subject: Re: [Qemu-devel] [PATCH 04/11] pc: give ISA bus to ISA methods
Date: Mon, 12 Dec 2011 10:40:11 -0600
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.21) Gecko/20110831 Lightning/1.0b2 Thunderbird/3.1.13

On 10/24/2011 03:18 PM, Hervé Poussineau wrote:

Signed-off-by: Hervé Poussineau<address@hidden>

Reviewed-by: Anthony Liguori <address@hidden>

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,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]