From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctcG0-0004YM-6C for qemu-devel@nongnu.org; Thu, 30 Mar 2017 11:45:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctcFx-0004pC-0v for qemu-devel@nongnu.org; Thu, 30 Mar 2017 11:45:04 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:34612) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctcFw-0004oi-Rr for qemu-devel@nongnu.org; Thu, 30 Mar 2017 11:45:00 -0400 Received: by mail-pg0-x241.google.com with SMTP id o123so10986100pga.1 for ; Thu, 30 Mar 2017 08:45:00 -0700 (PDT) From: Suramya Shah Date: Thu, 30 Mar 2017 21:14:13 +0530 Message-Id: <20170330154413.22014-1-shah.suramya@gmail.com> Subject: [Qemu-devel] [PATCH v2] hw/unicore32: remove wrong assertion in puv machine init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, gxt@mprc.pku.edu.cn, Suramya Shah Signed-off-by: Suramya Shah Reviewed-by: Marcel Apfelbaum 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