summary refs log tree commit diff stats
path: root/hw/pc_piix.c
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2011-12-15 22:09:54 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-20 15:44:30 -0600
commit605730793dfa0974a1dfb6a7a29d7eb68c0befbc (patch)
treea60a4ffecbcc3bb22f3fb7e8a1755626cd2d9ca9 /hw/pc_piix.c
parenta811f53ccb57911636f7d3d9cb1652d6d49df2c3 (diff)
downloadfocaccia-qemu-605730793dfa0974a1dfb6a7a29d7eb68c0befbc.tar.gz
focaccia-qemu-605730793dfa0974a1dfb6a7a29d7eb68c0befbc.zip
pc: give ISA bus to ISA methods
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc_piix.c')
-rw-r--r--hw/pc_piix.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index b4126b5117..77b88b40cf 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -137,7 +137,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,
@@ -146,7 +146,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;