From: Suramya Shah <shah.suramya@gmail.com>
To: qemu-devel@nongnu.org
Cc: marcel@redhat.com, gxt@mprc.pku.edu.cn,
Suramya Shah <shah.suramya@gmail.com>
Subject: [Qemu-devel] [PATCH v5] hw/unicore32: remove wrong assertion in puv machine init
Date: Thu, 30 Mar 2017 22:20:08 +0530 [thread overview]
Message-ID: <20170330165008.26419-1-shah.suramya@gmail.com> (raw)
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
Signed-off-by: Suramya Shah <shah.suramya@gmail.com>
---
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
next reply other threads:[~2017-03-30 16:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 16:50 Suramya Shah [this message]
2017-03-30 16:52 ` [Qemu-devel] [PATCH v5] hw/unicore32: remove wrong assertion in puv machine init Marcel Apfelbaum
2017-03-31 1:47 ` Xuetao Guan
2017-03-31 12:55 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170330165008.26419-1-shah.suramya@gmail.com \
--to=shah.suramya@gmail.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=marcel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).