Re: [Qemu-devel] [PATCH 1/3] sysfw: remove read-only pc_sysfw_flash_vs_rom_bug_compatible

[Jordan Justen]

On Mon, Jun 3, 2013 at 8:19 AM, Paolo Bonzini <address@hidden> wrote:
> The variable is not written anymore.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  hw/block/pc_sysfw.c | 26 +-------------------------
>  1 file changed, 1 insertion(+), 25 deletions(-)
>
> diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c
> index 412d1b0..c6d4be4 100644
> --- a/hw/block/pc_sysfw.c
> +++ b/hw/block/pc_sysfw.c
> @@ -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;

Hmm. I think we still need this to retain the 1.2-1.5 compatible
behavior. But, I think I maybe my kvm readonly series didn't properly
resurrect the pc_sysfw_flash_vs_rom_bug_compatible switch.

-Jordan

> -
>  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()) {
> --
> 1.8.1.4
>
>
>