[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/25] fix qemu-system-unicore32 crashing when callin
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel |
Date: |
Mon, 31 Jul 2017 13:21:21 +0300 |
From: Eduardo Otubo <address@hidden>
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 <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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.11.0
- [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 07/25] tests: add missing dependency to build QTEST_QEMU_BINARY, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 06/25] qemu-system-tricore: segfault when entering "x 0" on the monitor, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 10/25] qcow2: fix null pointer dereference, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg(), Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel,
Michael Tokarev <=
- [Qemu-devel] [PULL 12/25] net/eth: fix incorrect check of iov_to_buf() return value, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 08/25] loader: check get_image_size() return value, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 04/25] tests: test-netfilter && pxe-test require slirp, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 16/25] syscall: fix use of uninitialized values, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 13/25] m68k/translate: fix incorrect copy/paste, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 19/25] docs: fix broken paths to docs/interop dir, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 18/25] thunk: assert nb_fields is valid, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 17/25] syscall: check inotify() and eventfd() return value, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 20/25] docs: fix broken paths to docs/interop/qcow2.txt, Michael Tokarev, 2017/07/31
- [Qemu-devel] [PULL 22/25] docs: fix broken paths to docs/devel/atomics.txt, Michael Tokarev, 2017/07/31