diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-10-26 12:18:25 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-30 08:39:29 -0500 |
| commit | de2aff17a31c47e28757d426fb3384eed20eb2e5 (patch) | |
| tree | 16df32e5c08ef624ce7c60f559c16757e6635c55 /hw/loader.h | |
| parent | 14a3f32d9e0c955a63b046fd3542127d1778520b (diff) | |
| download | qemu-de2aff17a31c47e28757d426fb3384eed20eb2e5.tar.gz qemu-de2aff17a31c47e28757d426fb3384eed20eb2e5.tar.bz2 qemu-de2aff17a31c47e28757d426fb3384eed20eb2e5.zip | |
rom loader: make vga+rom loading configurable.
The rom_add_vga() and rom_add_option() macros are transformed into
functions. They look at the new rom_enable_driver_roms variable
and only do something if it is set to non-zero, making vga+option rom
loading runtime option. pc_init() sets rom_enable_driver_roms to 1.
With this in place we can move the rom loading calls from pc.c to the
individual drivers.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/loader.h')
| -rw-r--r-- | hw/loader.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/loader.h b/hw/loader.h index 945c662cc4..67dae571c3 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -38,9 +38,8 @@ void do_info_roms(Monitor *mon); #define PC_ROM_ALIGN 0x800 #define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA) -#define rom_add_vga(_f) \ - rom_add_file(_f, PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN) -#define rom_add_option(_f) \ - rom_add_file(_f, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN) +extern int rom_enable_driver_roms; +int rom_add_vga(const char *file); +int rom_add_option(const char *file); #endif |