From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 26 Jul 2017 15:04:46 +0000 (+0200)
Subject: fix qemu-system-unicore32 crashing when calling without -kernel
X-Git-Tag: v2.9.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfc65be6fb1ea5eab086817021962986ecd0d993;p=thirdparty%2Fqemu.git

fix qemu-system-unicore32 crashing when calling without -kernel

Starting qemu-system-unicore32 without the -kernel parameter results in
an assert() returns false and aborts qemu. This patch replaces it with a
proper error message followed by exit(1).

Signed-off-by: Eduardo Otubo <otubo@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 36bed541ca886da735bef1e8d76d09f8849ed5dd)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 032078fd3eb..f198ab870bd 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -93,7 +93,10 @@ static void puv3_load_kernel(const char *kernel_filename)
     if (kernel_filename == NULL && qtest_enabled()) {
         return;
     }
-    assert(kernel_filename != NULL);
+    if (kernel_filename == NULL) {
+        error_report("kernel parameter cannot be empty");
+        exit(1);
+    }
 
     /* only zImage format supported */
     size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,