ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove conditional rom loading support 

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

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-02-14 07:24:03 +00:00
parent ee0dc6d393
commit bc798c77e5
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/loader.c
View File

@ -537,7 +537,6 @@ struct Rom {
static FWCfgState *fw_cfg; static FWCfgState *fw_cfg;
static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms); static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms);
int rom_enable_driver_roms;
static void rom_insert(Rom *rom) 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) int rom_add_vga(const char *file)
{ {
if (!rom_enable_driver_roms)
return 0;
return rom_add_file(file, "vgaroms", 0); return rom_add_file(file, "vgaroms", 0);
} }
int rom_add_option(const char *file) int rom_add_option(const char *file)
{ {
if (!rom_enable_driver_roms)
return 0;
return rom_add_file(file, "genroms", 0); return rom_add_file(file, "genroms", 0);
} }

1
hw/loader.h
View File

@ -41,7 +41,6 @@ void do_info_roms(Monitor *mon);
#define PC_ROM_ALIGN 0x800 #define PC_ROM_ALIGN 0x800
#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA) #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_vga(const char *file);
int rom_add_option(const char *file); int rom_add_option(const char *file);

3
hw/pc.c
View File

@ -855,9 +855,6 @@ static void pc_init1(ram_addr_t ram_size,
isa_bios_size, isa_bios_size,
(bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM); (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
rom_enable_driver_roms = 1;
option_rom_offset = qemu_ram_alloc(PC_ROM_SIZE); option_rom_offset = qemu_ram_alloc(PC_ROM_SIZE);
cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE, option_rom_offset); cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE, option_rom_offset);