* Re: [Qemu-trivial] [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
[not found] <20170726150446.20381-1-otubo@redhat.com>
@ 2017-07-26 15:28 ` Paolo Bonzini
0 siblings, 0 replies; only message in thread
From: Paolo Bonzini @ 2017-07-26 15:28 UTC (permalink / raw)
To: Eduardo Otubo, qemu-devel; +Cc: thuth, qemu-trivial@nongnu.org
On 26/07/2017 17:04, 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).
>
> 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,
>
Cc: qemu-trivial@nongnu.org
^ permalink raw reply [flat|nested] only message in thread