]> www.infradead.org Git - users/dwmw2/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 Tokarev <mjt@tls.msk.ru>
Mon, 31 Jul 2017 10:05:49 +0000 (13:05 +0300)
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>
hw/unicore32/puv3.c

index e9d1a60b6ffea6728d6d5b20a83c6855f6581341..ff62efb4dfc1e64496fc1b2fdb44b0177c80d587 100644 (file)
@@ -92,7 +92,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,