From: Cédric Le Goater <clg@kaod.org>
Date: Mon, 25 Sep 2017 08:58:25 +0000 (+0200)
Subject: ppc/pnv: check for OPAL firmware file presence
X-Git-Tag: v2.11.0-rc0~75^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15fcedb26fce9cde3f3a2cec533101b6fe43f6e5;p=thirdparty%2Fqemu.git

ppc/pnv: check for OPAL firmware file presence

and exit before uselessly trying to load it if the file does not
exists.

Issue discovered by Coverity Scan.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 47221158d41..d46d91c76f5 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -570,10 +570,14 @@ static void ppc_powernv_init(MachineState *machine)
     }
 
     fw_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+    if (!fw_filename) {
+        error_report("Could not find OPAL firmware '%s'", bios_name);
+        exit(1);
+    }
 
     fw_size = load_image_targphys(fw_filename, FW_LOAD_ADDR, FW_MAX_SIZE);
     if (fw_size < 0) {
-        error_report("Could not load OPAL '%s'", fw_filename);
+        error_report("Could not load OPAL firmware '%s'", fw_filename);
         exit(1);
     }
     g_free(fw_filename);