diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2013-05-29 01:27:24 -0700 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-29 08:15:35 -0500 |
| commit | dade922f357c709c02eed2e1b1891453896756dd (patch) | |
| tree | a7c0fbfcebebe35706386de43845c324d797b70c | |
| parent | 338ea905e948613607c98346e127fc9472c57f0d (diff) | |
| download | qemu-dade922f357c709c02eed2e1b1891453896756dd.tar.gz qemu-dade922f357c709c02eed2e1b1891453896756dd.tar.bz2 qemu-dade922f357c709c02eed2e1b1891453896756dd.zip | |
isapc: Fix non-KVM qemu boot (read/write memory for isapc BIOS)
The isapc machine with seabios currently requires the BIOS region
to be read/write memory rather than read-only memory.
KVM currently cannot support the BIOS as a ROM region, but qemu
in non-KVM mode can. Based on this, isapc machine currently only
works with KVM.
To work-around this isapc issue, this change avoids marking the
BIOS as readonly for isapc.
This change also will allow KVM to start supporting ROM mode
via KVM_CAP_READONLY_MEM.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1369816047-16384-2-git-send-email-jordan.l.justen@intel.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/block/pc_sysfw.c | 16 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 5 |
2 files changed, 16 insertions, 5 deletions
diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c index 4f17668503..ea1a355785 100644 --- a/hw/block/pc_sysfw.c +++ b/hw/block/pc_sysfw.c @@ -39,6 +39,7 @@ typedef struct PcSysFwDevice { SysBusDevice busdev; uint8_t rom_only; + uint8_t isapc_ram_fw; } PcSysFwDevice; static void pc_isa_bios_init(MemoryRegion *rom_memory, @@ -139,7 +140,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory, pc_isa_bios_init(rom_memory, flash_mem, size); } -static void old_pc_system_rom_init(MemoryRegion *rom_memory) +static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) { char *filename; MemoryRegion *bios, *isa_bios; @@ -163,7 +164,9 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory) bios = g_malloc(sizeof(*bios)); memory_region_init_ram(bios, "pc.bios", bios_size); vmstate_register_ram_global(bios); - memory_region_set_readonly(bios, true); + if (!isapc_ram_fw) { + memory_region_set_readonly(bios, true); + } ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1); if (ret != 0) { bios_error: @@ -186,7 +189,9 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory) 0x100000 - isa_bios_size, isa_bios, 1); - memory_region_set_readonly(isa_bios, true); + if (!isapc_ram_fw) { + memory_region_set_readonly(isa_bios, true); + } /* map all the bios at the top of memory */ memory_region_add_subregion(rom_memory, @@ -216,7 +221,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) qdev_init_nofail(DEVICE(sysfw_dev)); if (sysfw_dev->rom_only) { - old_pc_system_rom_init(rom_memory); + old_pc_system_rom_init(rom_memory, sysfw_dev->isapc_ram_fw); return; } @@ -234,7 +239,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) exit(1); } else { sysfw_dev->rom_only = 1; - old_pc_system_rom_init(rom_memory); + old_pc_system_rom_init(rom_memory, sysfw_dev->isapc_ram_fw); return; } } @@ -255,6 +260,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) } static Property pcsysfw_properties[] = { + DEFINE_PROP_UINT8("isapc_ram_fw", PcSysFwDevice, isapc_ram_fw, 0), DEFINE_PROP_UINT8("rom_only", PcSysFwDevice, rom_only, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 43ab4807ae..530b6ab513 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -713,6 +713,11 @@ static QEMUMachine isapc_machine = { .property = "rom_only", .value = stringify(1), }, + { + .driver = "pc-sysfw", + .property = "isapc_ram_fw", + .value = stringify(1), + }, { /* end of list */ } }, DEFAULT_MACHINE_OPTIONS, |