aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.h
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-09-21 20:49:29 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-09-23 10:55:33 -0500
commit4463aee630685a6ac595b1acc777536f0a41d02d (patch)
treec9b04bde9b8424b92eeb56abf555d862e806b0ef /hw/pc.h
parentdd8e93799f13ef82d83c185b8e71e049452f7d40 (diff)
downloadqemu-4463aee630685a6ac595b1acc777536f0a41d02d.zip
qemu-4463aee630685a6ac595b1acc777536f0a41d02d.tar.gz
qemu-4463aee630685a6ac595b1acc777536f0a41d02d.tar.bz2
pc: Unbreak ROM mapping for ISA machine
This is based on the original fix by Hervé Poussineau: pc_memory_init actually takes a memory region for mapping BIOS and extension ROMs. That equals the PCI memory region if PCI is available, but must be system memory in the ISA case. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.h')
-rw-r--r--hw/pc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pc.h b/hw/pc.h
index dae736e..8e75c71 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -137,7 +137,7 @@ void pc_memory_init(MemoryRegion *system_memory,
const char *initrd_filename,
ram_addr_t below_4g_mem_size,
ram_addr_t above_4g_mem_size,
- MemoryRegion *pci_memory,
+ MemoryRegion *rom_memory,
MemoryRegion **ram_memory);
qemu_irq *pc_allocate_cpu_irq(void);
void pc_vga_init(PCIBus *pci_bus);