summaryrefslogtreecommitdiffstats
path: root/hw/i386/pc_piix.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-03-06 14:57:09 +0200
committerMichael S. Tsirkin <mst@redhat.com>2014-03-11 13:25:48 +0200
commitac41881b48858b279960a17c07f0b159af91e75a (patch)
tree4fdc78f45b3fe888b3aefd4c13ab4a0c8170e469 /hw/i386/pc_piix.c
parent98bc3ab0f256cb983700089770db0823e59c7ceb (diff)
downloadhqemu-ac41881b48858b279960a17c07f0b159af91e75a.zip
hqemu-ac41881b48858b279960a17c07f0b159af91e75a.tar.gz
pc: avoid duplicate names for ROM MRs
Since commit 04920fc0faa4760f9c4fc0e73b992b768099be70 loader: store FW CFG ROM files in RAM RAM MRs including ROM files in FW CFGs are created and named using the file basename. This becomes problematic if these names are supplied by user, since the basename might not be unique. There are two cases we care about: - option-rom flag. - option ROM for devices. This triggers e.g. when using rombar=0. At the moment we get an assert. E.g qemu -option-rom /usr/share/ipxe/8086100e.rom -option-rom /usr/share/ipxe.efi/8086100e.rom RAMBlock "/rom@genroms/8086100e.rom" already registered, abort! This is a regression from 1.6. For now let's keep it simple and just avoid creating the MRs in case of option ROMs. when using 1.7 machine types, enable option ROMs in RAM to match that version. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
-rw-r--r--hw/i386/pc_piix.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index fb2d636..5e1d2d3 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -266,6 +266,7 @@ static void pc_compat_1_7(QEMUMachineInitArgs *args)
{
smbios_type1_defaults = false;
gigabyte_align = false;
+ option_rom_has_mr = true;
}
static void pc_compat_1_6(QEMUMachineInitArgs *args)
OpenPOWER on IntegriCloud