From 5554a8bea7ed5a16e306fc384a88fe4ff25d9f1a Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Sat, 11 Jan 2014 17:59:55 +0100

Subject: [PATCH 05/22] isapc: Fix non-KVM qemu boot (read/write memory for isapc BIOS)

RH-Author: Laszlo Ersek <lersek@redhat.com>

Message-id: <1389463208-6278-6-git-send-email-lersek@redhat.com>

Patchwork-id: 56618

O-Subject: [RHEL-7.0 qemu-kvm PATCH 05/18] isapc: Fix non-KVM qemu boot (read/write memory for isapc BIOS)

Bugzilla: 1032346

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Amos Kong <akong@redhat.com>

RH-Acked-by: Andrew Jones <drjones@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

From: Jordan Justen <jordan.l.justen@intel.com>

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>

(cherry picked from commit dade922f357c709c02eed2e1b1891453896756dd)

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

---

 hw/block/pc_sysfw.c | 16 +++++++++++-----

 hw/i386/pc_piix.c   |  5 +++++

 2 files changed, 16 insertions(+), 5 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/block/pc_sysfw.c |   16 +++++++++++-----

 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 6149b20..4d82c70 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,

@@ -136,7 +137,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;

@@ -160,7 +161,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:

@@ -183,7 +186,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,

@@ -213,7 +218,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;

     }

@@ -231,7 +236,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;

         }

     }

@@ -252,6 +257,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 12351f9..0a8a4e5 100644

--- a/hw/i386/pc_piix.c

+++ b/hw/i386/pc_piix.c

@@ -714,6 +714,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,

-- 

1.7.1