diff options
| author | Hervé Poussineau | 2011-09-18 18:04:51 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-09-23 17:55:34 +0200 |
| commit | c1d23eaccc5020bb546a4391a0b2abf8ee861923 (patch) | |
| tree | d0a937e2d604ac9e2416c628f5b0dff56599f1bc /hw/pc_piix.c | |
| parent | build: fix race with creating qapi-generated (diff) | |
| download | qemu-c1d23eaccc5020bb546a4391a0b2abf8ee861923.tar.gz qemu-c1d23eaccc5020bb546a4391a0b2abf8ee861923.tar.xz qemu-c1d23eaccc5020bb546a4391a0b2abf8ee861923.zip | |
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.c | 2 |
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()) { |