aboutsummaryrefslogtreecommitdiff
path: root/hw/pc_piix.c
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2011-09-18 18:04:51 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-09-23 10:55:34 -0500
commitc1d23eaccc5020bb546a4391a0b2abf8ee861923 (patch)
treed0a937e2d604ac9e2416c628f5b0dff56599f1bc /hw/pc_piix.c
parente098fc3fd2a5c9be6b38f6f54bd466f218b7c4e9 (diff)
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>
Diffstat (limited to 'hw/pc_piix.c')
-rw-r--r--hw/pc_piix.c2
1 files changed, 1 insertions, 1 deletions
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()) {