* [Qemu-trivial] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
@ 2017-07-28 11:53 Eduardo Otubo
2017-07-31 10:16 ` Michael Tokarev
0 siblings, 1 reply; 2+ messages in thread
From: Eduardo Otubo @ 2017-07-28 11:53 UTC (permalink / raw)
To: qemu-trivial; +Cc: qemu-devel, gxt, thuth
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>
---
hw/unicore32/puv3.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index e9d1a60b6f..ff62efb4df 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -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,
--
2.13.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-trivial] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-28 11:53 [Qemu-trivial] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel Eduardo Otubo
@ 2017-07-31 10:16 ` Michael Tokarev
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:16 UTC (permalink / raw)
To: Eduardo Otubo, qemu-trivial; +Cc: thuth, gxt, qemu-devel
28.07.2017 14:53, Eduardo Otubo wrote:
> 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).
Applied to -trivial, thanks!
/mjt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-31 10:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-28 11:53 [Qemu-trivial] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel Eduardo Otubo
2017-07-31 10:16 ` Michael Tokarev
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).