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 <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
Message-id: [email protected]
Signed-off-by: Anthony Liguori <[email protected]>
diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c
index 4f17668..ea1a355 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
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 43ab480..530b6ab 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -713,6 +713,11 @@
.property = "rom_only",
.value = stringify(1),
},
+ {
+ .driver = "pc-sysfw",
+ .property = "isapc_ram_fw",
+ .value = stringify(1),
+ },
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
