* [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
@ 2017-07-26 15:04 Eduardo Otubo
2017-07-26 15:28 ` Paolo Bonzini
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Eduardo Otubo @ 2017-07-26 15:04 UTC (permalink / raw)
To: qemu-devel; +Cc: 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] 10+ messages in thread
* Re: [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-26 15:04 [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel Eduardo Otubo
@ 2017-07-26 15:28 ` Paolo Bonzini
2017-07-26 15:28 ` Cleber Rosa
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Paolo Bonzini @ 2017-07-26 15:28 UTC (permalink / raw)
To: Eduardo Otubo, qemu-devel; +Cc: thuth, qemu-trivial
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] 10+ messages in thread
* Re: [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-26 15:04 [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel Eduardo Otubo
2017-07-26 15:28 ` Paolo Bonzini
@ 2017-07-26 15:28 ` Cleber Rosa
2017-07-26 15:38 ` Cleber Rosa
2017-07-26 15:52 ` Thomas Huth
2017-07-26 16:00 ` Philippe Mathieu-Daudé
3 siblings, 1 reply; 10+ messages in thread
From: Cleber Rosa @ 2017-07-26 15:28 UTC (permalink / raw)
To: Eduardo Otubo, qemu-devel; +Cc: thuth
[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]
On 07/26/2017 11:04 AM, 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);
> + }
>
How do you actually trigger this? There's already appropriate command
line options handling in vl.c, which all targets (I tried) incorporate.
For unicore32:
$ ./unicore32-softmmu/qemu-system-unicore32 -kernel
qemu-system-unicore32: -kernel: requires an argument
I also see what I believe is proper handling with invalid kernels (or
empty options):
$ ./unicore32-softmmu/qemu-system-unicore32 -kernel ''
qemu-system-unicore32: Load kernel error: ''
Regards,
- Cleber.
> /* only zImage format supported */
> size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
>
--
Cleber Rosa
[ Sr Software Engineer - Virtualization Team - Red Hat ]
[ Avocado Test Framework - avocado-framework.github.io ]
[ 7ABB 96EB 8B46 B94D 5E0F E9BB 657E 8D33 A5F2 09F3 ]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-26 15:28 ` Cleber Rosa
@ 2017-07-26 15:38 ` Cleber Rosa
0 siblings, 0 replies; 10+ messages in thread
From: Cleber Rosa @ 2017-07-26 15:38 UTC (permalink / raw)
To: Eduardo Otubo, qemu-devel; +Cc: thuth
[-- Attachment #1: Type: text/plain, Size: 1956 bytes --]
On 07/26/2017 11:28 AM, Cleber Rosa wrote:
>
>
> On 07/26/2017 11:04 AM, 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);
>> + }
>>
>
> How do you actually trigger this? There's already appropriate command
> line options handling in vl.c, which all targets (I tried) incorporate.
> For unicore32:
>
Oh my, I misread your commit message. I see this is actually triggered
*without* -kernel, and not without a parameter.
- Cleber.
> $ ./unicore32-softmmu/qemu-system-unicore32 -kernel
> qemu-system-unicore32: -kernel: requires an argument
>
> I also see what I believe is proper handling with invalid kernels (or
> empty options):
>
> $ ./unicore32-softmmu/qemu-system-unicore32 -kernel ''
> qemu-system-unicore32: Load kernel error: ''
>
> Regards,
> - Cleber.
>
>> /* only zImage format supported */
>> size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
>>
>
--
Cleber Rosa
[ Sr Software Engineer - Virtualization Team - Red Hat ]
[ Avocado Test Framework - avocado-framework.github.io ]
[ 7ABB 96EB 8B46 B94D 5E0F E9BB 657E 8D33 A5F2 09F3 ]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-26 15:04 [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel Eduardo Otubo
2017-07-26 15:28 ` Paolo Bonzini
2017-07-26 15:28 ` Cleber Rosa
@ 2017-07-26 15:52 ` Thomas Huth
2017-07-26 16:00 ` Philippe Mathieu-Daudé
3 siblings, 0 replies; 10+ messages in thread
From: Thomas Huth @ 2017-07-26 15:52 UTC (permalink / raw)
To: Eduardo Otubo, qemu-devel
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,
That fixes the "crash", indeed.
Tested-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-26 15:04 [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel Eduardo Otubo
` (2 preceding siblings ...)
2017-07-26 15:52 ` Thomas Huth
@ 2017-07-26 16:00 ` Philippe Mathieu-Daudé
2017-07-26 16:05 ` Thomas Huth
3 siblings, 1 reply; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-26 16:00 UTC (permalink / raw)
To: Eduardo Otubo, qemu-devel; +Cc: thuth, Paolo Bonzini, Cleber Rosa
On 07/26/2017 12:04 PM, 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);
> + }
This seems a temporary kludge for 2.10 but not the correct long-term fix.
As commented in another thread [1] where I got a bit discomfited, it'd
be nice if during the 2.11 schedule the industry provide some help to
clean/unify the loader.c code, ideally remove all duplicated code not
arch-specific and use hw/core/loader*.
[1] http://lists.nongnu.org/archive/html/qemu-devel/2017-07/msg06760.html
>
> /* only zImage format supported */
> size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-26 16:00 ` Philippe Mathieu-Daudé
@ 2017-07-26 16:05 ` Thomas Huth
2017-07-26 16:50 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 10+ messages in thread
From: Thomas Huth @ 2017-07-26 16:05 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Eduardo Otubo, qemu-devel
Cc: Paolo Bonzini, Cleber Rosa
On 26.07.2017 18:00, Philippe Mathieu-Daudé wrote:
> On 07/26/2017 12:04 PM, 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);
>> + }
>
> This seems a temporary kludge for 2.10 but not the correct long-term fix.
>
> As commented in another thread [1] where I got a bit discomfited, it'd
> be nice if during the 2.11 schedule the industry provide some help to
> clean/unify the loader.c code, ideally remove all duplicated code not
> arch-specific and use hw/core/loader*.
>
> [1] http://lists.nongnu.org/archive/html/qemu-devel/2017-07/msg06760.html
Sorry, but this here *is* a machine-specific problem. I fail to see how
this should be related to the hw/core/loader.c code?
Thomas
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-26 16:05 ` Thomas Huth
@ 2017-07-26 16:50 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-26 16:50 UTC (permalink / raw)
To: Thomas Huth, Eduardo Otubo, qemu-devel; +Cc: Paolo Bonzini, Cleber Rosa
On 07/26/2017 01:05 PM, Thomas Huth wrote:
> On 26.07.2017 18:00, Philippe Mathieu-Daudé wrote:
>> On 07/26/2017 12:04 PM, 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);
>>> + }
>>
>> This seems a temporary kludge for 2.10 but not the correct long-term fix.
>>
>> As commented in another thread [1] where I got a bit discomfited, it'd
>> be nice if during the 2.11 schedule the industry provide some help to
>> clean/unify the loader.c code, ideally remove all duplicated code not
>> arch-specific and use hw/core/loader*.
>>
>> [1] http://lists.nongnu.org/archive/html/qemu-devel/2017-07/msg06760.html
>
> Sorry, but this here *is* a machine-specific problem. I fail to see how
> this should be related to the hw/core/loader.c code?
Yes, this assert is a problem, same as the one in xen_load_linux() and
this is a surgical fix, indeed.
I probably misused the "kludge" word, sorry. My comment was about
long-term use of -kernel.
Maybe I didn't point to the correct file, I was thinking about the
various hw/$arch/boot.c. My feeling is the -kernel parameter started as
something simple years ago then grow and now his usage is somehow
abused. I'd rather see a common hw/core/boot.c with each arch just
adding arch-related fixes.
For example in hw/arm/boot.c, see arm_load_kernel_notify(), except
features parsing, initrd_start and the fixupcontext part, most of the
code is multiarch and could benefit other archs less lov^H^H^Hsupported.
arm_load_kernel() is generic. In load_dtb() only the acells/scells is
arm-specific and could replace dup microblaze code, work on mips, etc.
Regards,
Phil.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [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; 10+ 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] 10+ messages in thread
* Re: [Qemu-devel] [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, 0 replies; 10+ 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] 10+ messages in thread
end of thread, other threads:[~2017-07-31 10:16 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-26 15:04 [Qemu-devel] [PATCH] fix qemu-system-unicore32 crashing when calling without -kernel Eduardo Otubo
2017-07-26 15:28 ` Paolo Bonzini
2017-07-26 15:28 ` Cleber Rosa
2017-07-26 15:38 ` Cleber Rosa
2017-07-26 15:52 ` Thomas Huth
2017-07-26 16:00 ` Philippe Mathieu-Daudé
2017-07-26 16:05 ` Thomas Huth
2017-07-26 16:50 ` Philippe Mathieu-Daudé
2017-07-28 11:53 Eduardo Otubo
2017-07-31 10:16 ` Michael Tokarev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.