From 6dd2a5c98a6b1c9189d342bcc3493c9b5dd1217e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 9 Aug 2013 12:35:02 -0500 Subject: 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 Signed-off-by: Markus Armbruster Message-id: 1376069702-22330-4-git-send-email-aliguori@us.ibm.com Rebased. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- include/hw/i386/pc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/hw/i386') diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 3a0c4e3..f79d478 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -19,6 +19,7 @@ typedef struct PcPciInfo { struct PcGuestInfo { bool has_pci_info; + bool isapc_ram_fw; FWCfgState *fw_cfg; }; @@ -200,7 +201,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); -- cgit v1.1