[Qemu-devel] [PATCH] Remove conditional rom loading support

[Blue Swirl]

Commit c2039bd0ffce8807e0eaac55254fde790825fa92 made rom loading
automatic for non-PC architectures. Remove now mostly unused
conditional rom loading support.

Signed-off-by: Blue Swirl <address@hidden>
---
 hw/loader.c |    5 -----
 hw/loader.h |    1 -
 hw/pc.c     |    3 ---
 3 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/hw/loader.c b/hw/loader.c
index b3bbd77..1448887 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -537,7 +537,6 @@ struct Rom {

 static FWCfgState *fw_cfg;
 static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms);
-int rom_enable_driver_roms;

 static void rom_insert(Rom *rom)
 {
@@ -624,15 +623,11 @@ int rom_add_blob(const char *name, const void
*blob, size_t len,

 int rom_add_vga(const char *file)
 {
-    if (!rom_enable_driver_roms)
-        return 0;
     return rom_add_file(file, "vgaroms", 0);
 }

 int rom_add_option(const char *file)
 {
-    if (!rom_enable_driver_roms)
-        return 0;
     return rom_add_file(file, "genroms", 0);
 }

diff --git a/hw/loader.h b/hw/loader.h
index 8ff3c94..56676e1 100644
--- a/hw/loader.h
+++ b/hw/loader.h
@@ -41,7 +41,6 @@ void do_info_roms(Monitor *mon);
 #define PC_ROM_ALIGN       0x800
 #define PC_ROM_SIZE        (PC_ROM_MAX - PC_ROM_MIN_VGA)

-extern int rom_enable_driver_roms;
 int rom_add_vga(const char *file);
 int rom_add_option(const char *file);

diff --git a/hw/pc.c b/hw/pc.c
index a674dbf..176d3cc 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -855,9 +855,6 @@ static void pc_init1(ram_addr_t ram_size,
                                  isa_bios_size,
                                  (bios_offset + bios_size -
isa_bios_size) | IO_MEM_ROM);

-
-
-    rom_enable_driver_roms = 1;
     option_rom_offset = qemu_ram_alloc(PC_ROM_SIZE);
     cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE,
option_rom_offset);

-- 
1.6.2.4