Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-15 05:06:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isapc: Fix non-KVM qemu boot (read/write memory for isapc BIOS)

Browse Source 
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>
This commit is contained in:
Jordan Justen 2013-05-29 01:27:24 -07:00 committed by Anthony Liguori
parent 338ea905e9
commit dade922f35
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/block/pc_sysfw.c
View File

@ -39,6 +39,7 @@
typedef struct PcSysFwDevice { typedef struct PcSysFwDevice {
SysBusDevice busdev; SysBusDevice busdev;
uint8_t rom_only; uint8_t rom_only;
uint8_t isapc_ram_fw;
} PcSysFwDevice; } PcSysFwDevice;
static void pc_isa_bios_init(MemoryRegion *rom_memory, 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); 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; char *filename;
MemoryRegion *bios, *isa_bios; MemoryRegion *bios, *isa_bios;
@ -163,7 +164,9 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory)
bios = g_malloc(sizeof(*bios)); bios = g_malloc(sizeof(*bios));
memory_region_init_ram(bios, "pc.bios", bios_size); memory_region_init_ram(bios, "pc.bios", bios_size);
vmstate_register_ram_global(bios); 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); ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
if (ret != 0) { if (ret != 0) {
bios_error: bios_error:
@ -186,7 +189,9 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory)
0x100000 - isa_bios_size, 0x100000 - isa_bios_size,
isa_bios, isa_bios,
1); 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 */ /* map all the bios at the top of memory */
memory_region_add_subregion(rom_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)); qdev_init_nofail(DEVICE(sysfw_dev));
if (sysfw_dev->rom_only) { 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; return;
} }
@ -234,7 +239,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory)
exit(1); exit(1);
} else { } else {
sysfw_dev->rom_only = 1; 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; return;
} }
} }
@ -255,6 +260,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory)
} }
static Property pcsysfw_properties[] = { 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_UINT8("rom_only", PcSysFwDevice, rom_only, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

5
hw/i386/pc_piix.c
View File

@ -713,6 +713,11 @@ static QEMUMachine isapc_machine = {
.property = "rom_only", .property = "rom_only",
.value = stringify(1), .value = stringify(1),
}, },
{
.driver = "pc-sysfw",
.property = "isapc_ram_fw",
.value = stringify(1),
},
{ /* end of list */ } { /* end of list */ }
}, },
DEFAULT_MACHINE_OPTIONS, DEFAULT_MACHINE_OPTIONS,