From: Andreas Färber <afaerber@suse.de>
Date: Wed, 3 Jul 2013 19:26:50 +0000 (+0200)
Subject: spapr: Respect -bios command line option for SLOF
X-Git-Tag: v1.6.0-rc0~136^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e7ea787a20e30d44232cafb5a6e9a9fea364c66;p=thirdparty%2Fqemu.git

spapr: Respect -bios command line option for SLOF

Allow the user to override the firmware file name rather than always
using "slof.bin".

Reported-by: Dinar Valeev <k0da@opensuse.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 5c31ad36bd1..48ae09283d1 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -940,7 +940,10 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
         }
     }
 
-    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, FW_FILE_NAME);
+    if (bios_name == NULL) {
+        bios_name = FW_FILE_NAME;
+    }
+    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
     fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE);
     if (fw_size < 0) {
         hw_error("qemu: could not load LPAR rtas '%s'\n", filename);