diff options
| author | Eduardo Otubo | 2017-07-26 17:04:46 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2017-07-31 12:05:49 +0200 |
| commit | 36bed541ca886da735bef1e8d76d09f8849ed5dd (patch) | |
| tree | 4babd56e0a82ce3b028bdb4315441f31b51e1aac /hw/unicore32 | |
| parent | tests: check-qom-proplist: fix leak (diff) | |
| download | qemu-36bed541ca886da735bef1e8d76d09f8849ed5dd.tar.gz qemu-36bed541ca886da735bef1e8d76d09f8849ed5dd.tar.xz qemu-36bed541ca886da735bef1e8d76d09f8849ed5dd.zip | |
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>
Diffstat (limited to 'hw/unicore32')
| -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 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, |
