From: Hervé Poussineau <hpoussin@reactos.org>
Date: Sun, 18 Sep 2011 16:04:51 +0000 (+0200)
Subject: isapc: give system address space when pci is disabled
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c1d23eaccc5020bb546a4391a0b2abf8ee861923;p=qemu.git

isapc: give system address space when pci is disabled

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index ec7da6d4c6..0144534e82 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -127,7 +127,7 @@ static void pc_init1(MemoryRegion *system_memory,
         pc_memory_init(system_memory,
                        kernel_filename, kernel_cmdline, initrd_filename,
                        below_4g_mem_size, above_4g_mem_size,
-                       rom_memory, &ram_memory);
+                       pci_enabled ? rom_memory : system_memory, &ram_memory);
     }
 
     if (!xen_enabled()) {