diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-05 13:08:35 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-05 13:08:35 +0000 |
| commit | 1192dad8798e4e4b72b14ff3a93c11cbb26eae5b (patch) | |
| tree | f8fee1c986ff32a08071858832591de15932dbc1 /hw/mips_malta.c | |
| parent | e9c05b42e33e60a18e443d6526e9400ea2714444 (diff) | |
| download | qemu-1192dad8798e4e4b72b14ff3a93c11cbb26eae5b.tar.gz | |
New '-bios' option, used to select an alternate BIOS image from bios_dir.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3331 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 3b37596d19..6f0edf9a3b 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -791,7 +791,9 @@ void mips_malta_init (int ram_size, int vga_ram_size, int boot_device, /* Load a BIOS image unless a kernel image has been specified. */ if (!kernel_filename) { - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME); + if (bios_name == NULL) + bios_name = BIOS_FILENAME; + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); ret = load_image(buf, phys_ram_base + bios_offset); if (ret < 0 || ret > BIOS_SIZE) { fprintf(stderr, |