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/sun4m.c | |
| parent | e9c05b42e33e60a18e443d6526e9400ea2714444 (diff) | |
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/sun4m.c')
| -rw-r--r-- | hw/sun4m.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index 76b0e7ee8f..f9961c7739 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -430,7 +430,9 @@ static void sun4m_load_kernel(long vram_size, int RAM_size, int boot_device, (PROM_SIZE_MAX + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK, prom_offset | IO_MEM_ROM); - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAME); + if (bios_name == NULL) + bios_name = PROM_FILENAME; + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); ret = load_elf(buf, PROM_PADDR - PROM_VADDR, NULL, NULL, NULL); if (ret < 0) { fprintf(stderr, "qemu: could not load prom '%s'\n", |