From 9e1c2ec8fd8d9a9ee299ea86c5f6c986fe25e838 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 10 May 2013 14:38:03 +0200 Subject: Revert "pc: Kill the "use flash device for BIOS unless KVM" misfeature" This reverts commit 9953f8822cc316eec9962f0a2858c3439a80adec. While Markus's analysis is entirely correct, there are 1.6 patches that fix the bug for real and without requiring machine type hacks. Let's think of the children who will have to read this code, and avoid a complicated mess of semantics that differ between <1.5, 1.5, and >1.5. Conflicts: hw/i386/pc_piix.c hw/i386/pc_q35.c include/hw/i386/pc.h Signed-off-by: Paolo Bonzini Acked-by: Anthony Liguori Message-id: 1368189483-7915-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori --- include/hw/i386/pc.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/hw/i386') diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 417afe4..2bd7090 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -169,7 +169,6 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd) } /* pc_sysfw.c */ -extern bool pc_sysfw_flash_vs_rom_bug_compatible; void pc_system_firmware_init(MemoryRegion *rom_memory); /* pvpanic.c */ @@ -239,10 +238,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .property = "romfile",\ .value = "pxe-virtio.rom",\ },{\ - .driver = "pc-sysfw",\ - .property = "rom_only",\ - .value = stringify(0),\ - },{\ .driver = "486-" TYPE_X86_CPU,\ .property = "model",\ .value = stringify(0),\ -- cgit v1.1