summaryrefslogtreecommitdiff
path: root/hw/i386/pc.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2015-12-11 16:42:30 -0200
committerMichael S. Tsirkin <mst@redhat.com>2016-02-06 20:44:09 +0200
commit5db3f0deaf165bd0ff247fcea042cb2e60671e43 (patch)
treef008875363a5c248fd8d06558e65397d51045635 /hw/i386/pc.c
parent5299f1c70aa7ebc89383363cd3d47fc4f5dc2163 (diff)
downloadqemu-5db3f0deaf165bd0ff247fcea042cb2e60671e43.tar.gz
qemu-5db3f0deaf165bd0ff247fcea042cb2e60671e43.tar.bz2
qemu-5db3f0deaf165bd0ff247fcea042cb2e60671e43.zip
pc: Remove PcGuestInfo.isapc_ram_fw field
The code can use the PCMachineClass.pci_enabled field directly. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Diffstat (limited to 'hw/i386/pc.c')
-rw-r--r--hw/i386/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f3fd0ed47c..dc0ade4a8c 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1365,7 +1365,7 @@ void pc_memory_init(PCMachineState *pcms,
}
/* Initialize PC system firmware */
- pc_system_firmware_init(rom_memory, guest_info->isapc_ram_fw);
+ pc_system_firmware_init(rom_memory, !pcmc->pci_enabled);
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,