]> git.proxmox.com Git - mirror_qemu.git/commitdiff
fix qemu-system-unicore32 crashing when calling without -kernel
authorEduardo Otubo <otubo@redhat.com>
Wed, 26 Jul 2017 15:04:46 +0000 (17:04 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Thu, 31 Aug 2017 16:24:20 +0000 (11:24 -0500)
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>
hw/unicore32/puv3.c

index 032078fd3ebf1521c392bf58ec58149134f66f33..f198ab870bd31d87592730bac89bffd8e0c1b75b 100644 (file)
@@ -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,