From 1192dad8798e4e4b72b14ff3a93c11cbb26eae5b Mon Sep 17 00:00:00 2001
From: j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
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/pc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'hw/pc.c')

diff --git a/hw/pc.c b/hw/pc.c
index ace0cee1ff..5bc0b63e79 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -706,7 +706,9 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
     vga_ram_addr = qemu_ram_alloc(vga_ram_size);
 
     /* BIOS load */
-    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);
     bios_size = get_image_size(buf);
     if (bios_size <= 0 ||
         (bios_size % 65536) != 0) {
-- 
cgit 1.4.1