From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxKFF-0001AA-Gk for qemu-devel@nongnu.org; Thu, 11 Jul 2013 13:01:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UxKFD-0001Mz-52 for qemu-devel@nongnu.org; Thu, 11 Jul 2013 13:01:29 -0400 From: Alexander Graf Date: Thu, 11 Jul 2013 19:01:07 +0200 Message-Id: <1373562085-29728-5-git-send-email-agraf@suse.de> In-Reply-To: <1373562085-29728-1-git-send-email-agraf@suse.de> References: <1373562085-29728-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 04/22] spapr: Respect -bios command line option for SLOF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno From: Andreas F=C3=A4rber Allow the user to override the firmware file name rather than always using "slof.bin". Reported-by: Dinar Valeev Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- hw/ppc/spapr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5c31ad3..48ae092 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -940,7 +940,10 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args= ) } } =20 - filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, FW_FILE_NAME); + if (bios_name =3D=3D NULL) { + bios_name =3D FW_FILE_NAME; + } + filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); fw_size =3D load_image_targphys(filename, 0, FW_MAX_SIZE); if (fw_size < 0) { hw_error("qemu: could not load LPAR rtas '%s'\n", filename); --=20 1.8.1.4