From 1192dad8798e4e4b72b14ff3a93c11cbb26eae5b Mon Sep 17 00:00:00 2001 From: j_mayer Date: Fri, 5 Oct 2007 13:08:35 +0000 Subject: 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 --- hw/shix.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'hw/shix.c') diff --git a/hw/shix.c b/hw/shix.c index e668426c89..884178e94f 100644 --- a/hw/shix.c +++ b/hw/shix.c @@ -83,12 +83,14 @@ void shix_init(int ram_size, int vga_ram_size, int boot_device, cpu_register_physical_memory(0x0c000000, 0x01000000, 0x01004000); /* Load BIOS in 0 (and access it through P2, 0xA0000000) */ - printf("%s: load BIOS '%s'\n", __func__, BIOS_FILENAME); - ret = load_image(BIOS_FILENAME, phys_ram_base); + if (bios_name == NULL) + bios_name = BIOS_FILENAME; + printf("%s: load BIOS '%s'\n", __func__, bios_name); + ret = load_image(bios_name, phys_ram_base); if (ret < 0) { /* Check bios size */ fprintf(stderr, "ret=%d\n", ret); fprintf(stderr, "qemu: could not load SHIX bios '%s'\n", - BIOS_FILENAME); + bios_name); exit(1); } -- cgit 1.4.1