qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v2] hw/unicore32: remove wrong assertion in puv mach


From: Suramya Shah
Subject: [Qemu-devel] [PATCH v2] hw/unicore32: remove wrong assertion in puv machine init
Date: Thu, 30 Mar 2017 21:14:13 +0530

Signed-off-by: Suramya Shah <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>

Running QEMU with qemu-system-unicore32 without the kernel parameter results in 
an assertion error.
Assert should not be used to check user provided parameters. Report an error 
and exit instead
---
 hw/unicore32/puv3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 032078f..2c17cc9 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -93,8 +93,11 @@ 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("No kernel found");
+        exit(1);
+    }
+
     /* only zImage format supported */
     size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
             KERNEL_MAX_SIZE);
-- 
2.9.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]