openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sysfw: remove read-only pc_sysfw_flash_vs_rom_bug_compatible 

The variable is not written anymore.

This cleans up after 9e1c2ec (which accidentally left variable
pc_sysfw_flash_vs_rom_bug_compatible behind, value always zero), and
buries dead code from commit dafb82e (which resurrected the pc_sysfw
code for pc_sysfw_flash_vs_rom_bug_compatible by mistake).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1376069702-22330-2-git-send-email-aliguori@us.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-08-09 12:35:00 -05:00 committed by Anthony Liguori
parent 0b516ef0df
commit 133bb095ac
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/block/pc_sysfw.c
View File

@ -199,12 +199,6 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw)
bios);
}
/*
* Bug-compatible flash vs. ROM selection enabled?
* A few older machines enable this.
*/
bool pc_sysfw_flash_vs_rom_bug_compatible;
void pc_system_firmware_init(MemoryRegion *rom_memory)
{
DriveInfo *pflash_drv;
@ -222,25 +216,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory)
pflash_drv = drive_get(IF_PFLASH, 0, 0);
if (pc_sysfw_flash_vs_rom_bug_compatible) {
/*
* This is a Bad Idea, because it makes enabling/disabling KVM
* guest-visible. Do it only in bug-compatibility mode.
*/
if (kvm_enabled()) {
if (pflash_drv != NULL) {
fprintf(stderr, "qemu: pflash cannot be used with kvm enabled\n");
exit(1);
} else {
/* In old pc_sysfw_flash_vs_rom_bug_compatible mode, we assume
* that KVM cannot execute from device memory. In this case, we
* use old rom based firmware initialization for KVM. But, since
* this is different from non-kvm mode, this behavior is
* undesirable */
sysfw_dev->rom_only = 1;
}
}
} else if (pflash_drv == NULL) {
if (pflash_drv == NULL) {
/* When a pflash drive is not found, use rom-mode */
sysfw_dev->rom_only = 1;
} else if (kvm_enabled() && !kvm_readonly_mem_enabled()) {