diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-09 12:35:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-08-12 09:31:14 -0500 |
| commit | 6dd2a5c98a6b1c9189d342bcc3493c9b5dd1217e (patch) | |
| tree | a054eb04c6992ab648c9c92de6aefdfa64daea8d /hw/i386/pc.c | |
| parent | a904410af5f1ed6ff031e9e4119ca2f5d99647ce (diff) | |
| download | qemu-6dd2a5c98a6b1c9189d342bcc3493c9b5dd1217e.tar.gz | |
pc_sysfw: do not make it a device anymore
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>
Diffstat (limited to 'hw/i386/pc.c')
| -rw-r--r-- | hw/i386/pc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6a0b042786..e8bc8ce172 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1145,7 +1145,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, NULL, "pc.rom", PC_ROM_SIZE); |