summaryrefslogtreecommitdiffstats
path: root/hw/i386/pc_piix.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-08-09 12:35:02 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-08-12 09:31:14 -0500
commit6dd2a5c98a6b1c9189d342bcc3493c9b5dd1217e (patch)
treea054eb04c6992ab648c9c92de6aefdfa64daea8d /hw/i386/pc_piix.c
parenta904410af5f1ed6ff031e9e4119ca2f5d99647ce (diff)
downloadhqemu-6dd2a5c98a6b1c9189d342bcc3493c9b5dd1217e.zip
hqemu-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_piix.c')
-rw-r--r--hw/i386/pc_piix.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index cd88df9..a19e172 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -128,6 +128,7 @@ static void pc_init1(MemoryRegion *system_memory,
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
guest_info->has_pci_info = has_pci_info;
+ guest_info->isapc_ram_fw = !pci_enabled;
/* allocate ram and load rom/bios */
if (!xen_enabled()) {
@@ -742,11 +743,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,
OpenPOWER on IntegriCloud