diff options
| author | Eduardo Otubo <otubo@redhat.com> | 2017-07-26 17:04:46 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-08-31 11:24:20 -0500 |
| commit | cfc65be6fb1ea5eab086817021962986ecd0d993 (patch) | |
| tree | 5a14976ef587fafa8d179ba2d7b8cb70cf071be9 | |
| parent | ac0038f18299353580388e969992dab49ae90531 (diff) | |
| download | qemu-cfc65be6fb1ea5eab086817021962986ecd0d993.tar.gz | |
fix qemu-system-unicore32 crashing when calling without -kernel
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>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 36bed541ca886da735bef1e8d76d09f8849ed5dd)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/unicore32/puv3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 032078fd3e..f198ab870b 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -93,7 +93,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, |