From b9968ba04f7d8528d07c49bf523474ac4cb63acd Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Wed, 29 Jan 2014 07:06:24 +0100

Subject: [PATCH 12/22] pc_sysfw: do not make it a device anymore

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

Patchwork-id: 56625

O-Subject: [RHEL-7.0 qemu-kvm PATCH 12/18] pc_sysfw: do not make it a device anymore

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>

From: Paolo Bonzini <pbonzini@redhat.com>

Move the code to hw/i386, the sole remaining property is available

as !pci_enabled.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Message-id: 1376069702-22330-4-git-send-email-aliguori@us.ibm.com

Rebased.

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

(cherry picked from commit 6dd2a5c98a6b1c9189d342bcc3493c9b5dd1217e)

Conflicts:

	hw/block/Makefile.objs

	hw/i386/pc_q35.c

	include/hw/i386/pc.h

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

---

 hw/block/Makefile.objs             |  1 -

 hw/i386/Makefile.objs              |  1 +

 include/hw/i386/pc.h               |  4 ++-

 hw/i386/pc.c                       |  2 +-

 hw/i386/pc_piix.c                  |  6 +----

 hw/i386/pc_q35.c                   |  1 +

 hw/{block => i386}/pc_sysfw.c      | 52 +++-----------------------------------

 default-configs/i386-softmmu.mak   |  1 -

 default-configs/x86_64-softmmu.mak |  1 -

 9 files changed, 10 insertions(+), 59 deletions(-)

 rename hw/{block => i386}/pc_sysfw.c (81%)

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

---

 default-configs/i386-softmmu.mak   |    1 -

 default-configs/x86_64-softmmu.mak |    1 -

 hw/block/Makefile.objs             |    1 -

 hw/block/pc_sysfw.c                |  231 ------------------------------------

 hw/i386/Makefile.objs              |    1 +

 hw/i386/pc.c                       |    2 +-

 hw/i386/pc_piix.c                  |    6 +-

 hw/i386/pc_q35.c                   |    1 +

 hw/i386/pc_sysfw.c                 |  185 +++++++++++++++++++++++++++++

 include/hw/i386/pc.h               |    4 +-

 10 files changed, 192 insertions(+), 241 deletions(-)

 delete mode 100644 hw/block/pc_sysfw.c

 create mode 100644 hw/i386/pc_sysfw.c

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak

index 03deca2..fb84f80 100644

--- a/default-configs/i386-softmmu.mak

+++ b/default-configs/i386-softmmu.mak

@@ -34,7 +34,6 @@ CONFIG_PAM=y

 CONFIG_PCI_PIIX=y

 CONFIG_PCI_HOTPLUG=y

 CONFIG_WDT_IB700=y

-CONFIG_PC_SYSFW=y

 CONFIG_XEN_I386=$(CONFIG_XEN)

 CONFIG_ISA_DEBUG=y

 CONFIG_ISA_TESTDEV=y

diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak

index 7b8b05c..a6fdf84 100644

--- a/default-configs/x86_64-softmmu.mak

+++ b/default-configs/x86_64-softmmu.mak

@@ -27,7 +27,6 @@ CONFIG_PAM=y

 CONFIG_PCI_PIIX=y

 CONFIG_PCI_HOTPLUG=y

 CONFIG_WDT_IB700=y

-CONFIG_PC_SYSFW=y

 CONFIG_XEN_I386=$(CONFIG_XEN)

 CONFIG_ISA_DEBUG=y

 CONFIG_ISA_TESTDEV=y

diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs

index e4329a0..94491bf 100644

--- a/hw/block/Makefile.objs

+++ b/hw/block/Makefile.objs

@@ -7,7 +7,6 @@ common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o

 common-obj-$(CONFIG_XEN_BACKEND) += xen_disk.o

 common-obj-$(CONFIG_ECC) += ecc.o

 common-obj-$(CONFIG_ONENAND) += onenand.o

-common-obj-$(CONFIG_PC_SYSFW) += pc_sysfw.o

 obj-$(CONFIG_SH4) += tc58128.o

diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c

deleted file mode 100644

index f9c0633..0000000

--- a/hw/block/pc_sysfw.c

+++ /dev/null

@@ -1,231 +0,0 @@

-/*

- * QEMU PC System Firmware

- *

- * Copyright (c) 2003-2004 Fabrice Bellard

- * Copyright (c) 2011-2012 Intel Corporation

- *

- * Permission is hereby granted, free of charge, to any person obtaining a copy

- * of this software and associated documentation files (the "Software"), to deal

- * in the Software without restriction, including without limitation the rights

- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- * copies of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

- * THE SOFTWARE.

- */

-

-#include "sysemu/blockdev.h"

-#include "qemu/error-report.h"

-#include "hw/sysbus.h"

-#include "hw/hw.h"

-#include "hw/i386/pc.h"

-#include "hw/boards.h"

-#include "hw/loader.h"

-#include "sysemu/sysemu.h"

-#include "hw/block/flash.h"

-#include "sysemu/kvm.h"

-

-#define BIOS_FILENAME "bios.bin"

-

-typedef struct PcSysFwDevice {

-    SysBusDevice busdev;

-    uint8_t isapc_ram_fw;

-} PcSysFwDevice;

-

-static void pc_isa_bios_init(MemoryRegion *rom_memory,

-                             MemoryRegion *flash_mem,

-                             int ram_size)

-{

-    int isa_bios_size;

-    MemoryRegion *isa_bios;

-    uint64_t flash_size;

-    void *flash_ptr, *isa_bios_ptr;

-

-    flash_size = memory_region_size(flash_mem);

-

-    /* map the last 128KB of the BIOS in ISA space */

-    isa_bios_size = MIN(flash_size, 128 * 1024);

-    isa_bios = g_malloc(sizeof(*isa_bios));

-    memory_region_init_ram(isa_bios, "isa-bios", isa_bios_size);

-    vmstate_register_ram_global(isa_bios);

-    memory_region_add_subregion_overlap(rom_memory,

-                                        0x100000 - isa_bios_size,

-                                        isa_bios,

-                                        1);

-

-    /* copy ISA rom image from top of flash memory */

-    flash_ptr = memory_region_get_ram_ptr(flash_mem);

-    isa_bios_ptr = memory_region_get_ram_ptr(isa_bios);

-    memcpy(isa_bios_ptr,

-           ((uint8_t*)flash_ptr) + (flash_size - isa_bios_size),

-           isa_bios_size);

-

-    memory_region_set_readonly(isa_bios, true);

-}

-

-static void pc_system_flash_init(MemoryRegion *rom_memory,

-                                 DriveInfo *pflash_drv)

-{

-    BlockDriverState *bdrv;

-    int64_t size;

-    hwaddr phys_addr;

-    int sector_bits, sector_size;

-    pflash_t *system_flash;

-    MemoryRegion *flash_mem;

-

-    bdrv = pflash_drv->bdrv;

-    size = bdrv_getlength(pflash_drv->bdrv);

-    sector_bits = 12;

-    sector_size = 1 << sector_bits;

-

-    if ((size % sector_size) != 0) {

-        fprintf(stderr,

-                "qemu: PC system firmware (pflash) must be a multiple of 0x%x\n",

-                sector_size);

-        exit(1);

-    }

-

-    phys_addr = 0x100000000ULL - size;

-    system_flash = pflash_cfi01_register(phys_addr, NULL, "system.flash", size,

-                                         bdrv, sector_size, size >> sector_bits,

-                                         1, 0x0000, 0x0000, 0x0000, 0x0000, 0);

-    flash_mem = pflash_cfi01_get_memory(system_flash);

-

-    pc_isa_bios_init(rom_memory, flash_mem, size);

-}

-

-static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw)

-{

-    char *filename;

-    MemoryRegion *bios, *isa_bios;

-    int bios_size, isa_bios_size;

-    int ret;

-

-    /* BIOS load */

-    if (bios_name == NULL) {

-        bios_name = BIOS_FILENAME;

-    }

-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

-    if (filename) {

-        bios_size = get_image_size(filename);

-    } else {

-        bios_size = -1;

-    }

-    if (bios_size <= 0 ||

-        (bios_size % 65536) != 0) {

-        goto bios_error;

-    }

-    bios = g_malloc(sizeof(*bios));

-    memory_region_init_ram(bios, "pc.bios", bios_size);

-    vmstate_register_ram_global(bios);

-    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:

-        fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);

-        exit(1);

-    }

-    if (filename) {

-        g_free(filename);

-    }

-

-    /* map the last 128KB of the BIOS in ISA space */

-    isa_bios_size = bios_size;

-    if (isa_bios_size > (128 * 1024)) {

-        isa_bios_size = 128 * 1024;

-    }

-    isa_bios = g_malloc(sizeof(*isa_bios));

-    memory_region_init_alias(isa_bios, "isa-bios", bios,

-                             bios_size - isa_bios_size, isa_bios_size);

-    memory_region_add_subregion_overlap(rom_memory,

-                                        0x100000 - isa_bios_size,

-                                        isa_bios,

-                                        1);

-    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,

-                                (uint32_t)(-bios_size),

-                                bios);

-}

-

-void pc_system_firmware_init(MemoryRegion *rom_memory)

-{

-    DriveInfo *pflash_drv;

-    PcSysFwDevice *sysfw_dev;

-

-    /*

-     * TODO This device exists only so that users can switch between

-     * use of flash and ROM for the BIOS.  The ability to switch was

-     * created because flash doesn't work with KVM.  Once it does, we

-     * should drop this device.

-     */

-    sysfw_dev = (PcSysFwDevice*) qdev_create(NULL, "pc-sysfw");

-

-    qdev_init_nofail(DEVICE(sysfw_dev));

-

-    pflash_drv = drive_get(IF_PFLASH, 0, 0);

-

-    if (sysfw_dev->isapc_ram_fw || pflash_drv == NULL) {

-        /* When a pflash drive is not found, use rom-mode */

-        old_pc_system_rom_init(rom_memory, sysfw_dev->isapc_ram_fw);

-        return;

-    }

-

-    if (kvm_enabled() && !kvm_readonly_mem_enabled()) {

-        /* Older KVM cannot execute from device memory. So, flash memory

-         * cannot be used unless the readonly memory kvm capability is present. */

-        fprintf(stderr, "qemu: pflash with kvm requires KVM readonly memory support\n");

-        exit(1);

-    }

-

-    pc_system_flash_init(rom_memory, pflash_drv);

-}

-

-static Property pcsysfw_properties[] = {

-    DEFINE_PROP_UINT8("isapc_ram_fw", PcSysFwDevice, isapc_ram_fw, 0),

-    DEFINE_PROP_END_OF_LIST(),

-};

-

-static int pcsysfw_init(DeviceState *dev)

-{

-    return 0;

-}

-

-static void pcsysfw_class_init (ObjectClass *klass, void *data)

-{

-    DeviceClass *dc = DEVICE_CLASS (klass);

-

-    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

-    dc->desc = "PC System Firmware";

-    dc->init = pcsysfw_init;

-    dc->props = pcsysfw_properties;

-}

-

-static const TypeInfo pcsysfw_info = {

-    .name          = "pc-sysfw",

-    .parent        = TYPE_SYS_BUS_DEVICE,

-    .instance_size = sizeof (PcSysFwDevice),

-    .class_init    = pcsysfw_class_init,

-};

-

-static void pcsysfw_register (void)

-{

-    type_register_static (&pcsysfw_info);

-}

-

-type_init (pcsysfw_register);

-

diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs

index 6a17cf8..09ac433 100644

--- a/hw/i386/Makefile.objs

+++ b/hw/i386/Makefile.objs

@@ -1,6 +1,7 @@

 obj-$(CONFIG_KVM) += kvm/

 obj-y += multiboot.o smbios.o

 obj-y += pc.o pc_piix.o pc_q35.o

+obj-y += pc_sysfw.o

 obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o

 obj-y += kvmvapic.o

diff --git a/hw/i386/pc.c b/hw/i386/pc.c

index 320f668..a0f0b24 100644

--- a/hw/i386/pc.c

+++ b/hw/i386/pc.c

@@ -1162,7 +1162,7 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory,

     /* Initialize PC system firmware */

-    pc_system_firmware_init(rom_memory);

+    pc_system_firmware_init(rom_memory, guest_info->isapc_ram_fw);

     option_rom_mr = g_malloc(sizeof(*option_rom_mr));

     memory_region_init_ram(option_rom_mr, "pc.rom", PC_ROM_SIZE);

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c

index 6f273db..641f3d9 100644

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

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

@@ -141,6 +141,7 @@ static void pc_init1(QEMUMachineInitArgs *args,

     guest_info->has_acpi_build = has_acpi_build;

     guest_info->has_pci_info = has_pci_info;

+    guest_info->isapc_ram_fw = !pci_enabled;

     /* allocate ram and load rom/bios */

     if (!xen_enabled()) {

@@ -705,11 +706,6 @@ static QEMUMachine isapc_machine = {

     .init = pc_init_isa,

     .max_cpus = 1,

     .compat_props = (GlobalProperty[]) {

-        {

-            .driver   = "pc-sysfw",

-            .property = "isapc_ram_fw",

-            .value    = stringify(1),

-        },

         { /* end of list */ }

     },

     DEFAULT_MACHINE_OPTIONS,

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c

index 7e46799..1ac46be 100644

--- a/hw/i386/pc_q35.c

+++ b/hw/i386/pc_q35.c

@@ -114,6 +114,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)

     guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);

     guest_info->has_pci_info = has_pci_info;

     guest_info->has_acpi_build = has_acpi_build;

+    guest_info->isapc_ram_fw = false;

     /* allocate ram and load rom/bios */

     if (!xen_enabled()) {

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c

new file mode 100644

index 0000000..eb56dee

--- /dev/null

+++ b/hw/i386/pc_sysfw.c

@@ -0,0 +1,185 @@

+/*

+ * QEMU PC System Firmware

+ *

+ * Copyright (c) 2003-2004 Fabrice Bellard

+ * Copyright (c) 2011-2012 Intel Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+ * THE SOFTWARE.

+ */

+

+#include "sysemu/blockdev.h"

+#include "qemu/error-report.h"

+#include "hw/sysbus.h"

+#include "hw/hw.h"

+#include "hw/i386/pc.h"

+#include "hw/boards.h"

+#include "hw/loader.h"

+#include "sysemu/sysemu.h"

+#include "hw/block/flash.h"

+#include "sysemu/kvm.h"

+

+#define BIOS_FILENAME "bios.bin"

+

+typedef struct PcSysFwDevice {

+    SysBusDevice busdev;

+    uint8_t isapc_ram_fw;

+} PcSysFwDevice;

+

+static void pc_isa_bios_init(MemoryRegion *rom_memory,

+                             MemoryRegion *flash_mem,

+                             int ram_size)

+{

+    int isa_bios_size;

+    MemoryRegion *isa_bios;

+    uint64_t flash_size;

+    void *flash_ptr, *isa_bios_ptr;

+

+    flash_size = memory_region_size(flash_mem);

+

+    /* map the last 128KB of the BIOS in ISA space */

+    isa_bios_size = MIN(flash_size, 128 * 1024);

+    isa_bios = g_malloc(sizeof(*isa_bios));

+    memory_region_init_ram(isa_bios, "isa-bios", isa_bios_size);

+    vmstate_register_ram_global(isa_bios);

+    memory_region_add_subregion_overlap(rom_memory,

+                                        0x100000 - isa_bios_size,

+                                        isa_bios,

+                                        1);

+

+    /* copy ISA rom image from top of flash memory */

+    flash_ptr = memory_region_get_ram_ptr(flash_mem);

+    isa_bios_ptr = memory_region_get_ram_ptr(isa_bios);

+    memcpy(isa_bios_ptr,

+           ((uint8_t*)flash_ptr) + (flash_size - isa_bios_size),

+           isa_bios_size);

+

+    memory_region_set_readonly(isa_bios, true);

+}

+

+static void pc_system_flash_init(MemoryRegion *rom_memory,

+                                 DriveInfo *pflash_drv)

+{

+    BlockDriverState *bdrv;

+    int64_t size;

+    hwaddr phys_addr;

+    int sector_bits, sector_size;

+    pflash_t *system_flash;

+    MemoryRegion *flash_mem;

+

+    bdrv = pflash_drv->bdrv;

+    size = bdrv_getlength(pflash_drv->bdrv);

+    sector_bits = 12;

+    sector_size = 1 << sector_bits;

+

+    if ((size % sector_size) != 0) {

+        fprintf(stderr,

+                "qemu: PC system firmware (pflash) must be a multiple of 0x%x\n",

+                sector_size);

+        exit(1);

+    }

+

+    phys_addr = 0x100000000ULL - size;

+    system_flash = pflash_cfi01_register(phys_addr, NULL, "system.flash", size,

+                                         bdrv, sector_size, size >> sector_bits,

+                                         1, 0x0000, 0x0000, 0x0000, 0x0000, 0);

+    flash_mem = pflash_cfi01_get_memory(system_flash);

+

+    pc_isa_bios_init(rom_memory, flash_mem, size);

+}

+

+static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw)

+{

+    char *filename;

+    MemoryRegion *bios, *isa_bios;

+    int bios_size, isa_bios_size;

+    int ret;

+

+    /* BIOS load */

+    if (bios_name == NULL) {

+        bios_name = BIOS_FILENAME;

+    }

+    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);

+    if (filename) {

+        bios_size = get_image_size(filename);

+    } else {

+        bios_size = -1;

+    }

+    if (bios_size <= 0 ||

+        (bios_size % 65536) != 0) {

+        goto bios_error;

+    }

+    bios = g_malloc(sizeof(*bios));

+    memory_region_init_ram(bios, "pc.bios", bios_size);

+    vmstate_register_ram_global(bios);

+    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:

+        fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);

+        exit(1);

+    }

+    if (filename) {

+        g_free(filename);

+    }

+

+    /* map the last 128KB of the BIOS in ISA space */

+    isa_bios_size = bios_size;

+    if (isa_bios_size > (128 * 1024)) {

+        isa_bios_size = 128 * 1024;

+    }

+    isa_bios = g_malloc(sizeof(*isa_bios));

+    memory_region_init_alias(isa_bios, "isa-bios", bios,

+                             bios_size - isa_bios_size, isa_bios_size);

+    memory_region_add_subregion_overlap(rom_memory,

+                                        0x100000 - isa_bios_size,

+                                        isa_bios,

+                                        1);

+    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,

+                                (uint32_t)(-bios_size),

+                                bios);

+}

+

+void pc_system_firmware_init(MemoryRegion *rom_memory, bool isapc_ram_fw)

+{

+    DriveInfo *pflash_drv;

+

+    pflash_drv = drive_get(IF_PFLASH, 0, 0);

+

+    if (isapc_ram_fw || pflash_drv == NULL) {

+        /* When a pflash drive is not found, use rom-mode */

+        old_pc_system_rom_init(rom_memory, isapc_ram_fw);

+        return;

+    }

+

+    if (kvm_enabled() && !kvm_readonly_mem_enabled()) {

+        /* Older KVM cannot execute from device memory. So, flash memory

+         * cannot be used unless the readonly memory kvm capability is present. */

+        fprintf(stderr, "qemu: pflash with kvm requires KVM readonly memory support\n");

+        exit(1);

+    }

+

+    pc_system_flash_init(rom_memory, pflash_drv);

+}

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h

index 5c69abe..413358f 100644

--- a/include/hw/i386/pc.h

+++ b/include/hw/i386/pc.h

@@ -34,6 +34,7 @@ typedef struct PcPciInfo {

 struct PcGuestInfo {

     bool has_pci_info;

+    bool isapc_ram_fw;

     hwaddr ram_size;

     unsigned apic_id_limit;

     bool apic_xrupt_override;

@@ -228,7 +229,8 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)

 }

 /* pc_sysfw.c */

-void pc_system_firmware_init(MemoryRegion *rom_memory);

+void pc_system_firmware_init(MemoryRegion *rom_memory,

+                             bool isapc_ram_fw);

 /* pvpanic.c */

 void pvpanic_init(ISABus *bus);

-- 

1.7.1