* [Qemu-devel] [PATCH] s390-ccw: only print boot menu error if -boot menu=on was specified
@ 2018-02-27 15:19 Collin L. Walling
2018-02-27 19:18 ` Cornelia Huck
0 siblings, 1 reply; 3+ messages in thread
From: Collin L. Walling @ 2018-02-27 15:19 UTC (permalink / raw)
To: qemu-s390x, qemu-devel; +Cc: borntraeger, cohuck, thuth, mihajlov
It is possible that certain QEMU configurations may not
create an IPLB (such as when -kernel is provided). In
this case, a misleading error message will be printed
stating that the "boot menu is not supported for this
device type".
To amend this, only print this message iff boot menu=on
was provided on the commandline. Otherwise, return silently.
Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
---
hw/s390x/ipl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 798e99a..c4addb5 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -250,7 +250,9 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
case S390_IPL_TYPE_QEMU_SCSI:
break;
default:
- error_report("boot menu is not supported for this device type.");
+ if (boot_menu) {
+ error_report("boot menu is not supported for this device type.");
+ }
return;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] s390-ccw: only print boot menu error if -boot menu=on was specified
2018-02-27 15:19 [Qemu-devel] [PATCH] s390-ccw: only print boot menu error if -boot menu=on was specified Collin L. Walling
@ 2018-02-27 19:18 ` Cornelia Huck
2018-02-27 19:29 ` Collin L. Walling
0 siblings, 1 reply; 3+ messages in thread
From: Cornelia Huck @ 2018-02-27 19:18 UTC (permalink / raw)
To: Collin L. Walling; +Cc: qemu-s390x, qemu-devel, borntraeger, thuth, mihajlov
On Tue, 27 Feb 2018 10:19:20 -0500
"Collin L. Walling" <walling@linux.vnet.ibm.com> wrote:
Nit: make the prefix s390x/ipl:, as this is not directly in the bios.
> It is possible that certain QEMU configurations may not
> create an IPLB (such as when -kernel is provided). In
> this case, a misleading error message will be printed
> stating that the "boot menu is not supported for this
> device type".
>
> To amend this, only print this message iff boot menu=on
> was provided on the commandline. Otherwise, return silently.
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
> ---
> hw/s390x/ipl.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 798e99a..c4addb5 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -250,7 +250,9 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
> case S390_IPL_TYPE_QEMU_SCSI:
> break;
> default:
> - error_report("boot menu is not supported for this device type.");
> + if (boot_menu) {
> + error_report("boot menu is not supported for this device type.");
> + }
> return;
> }
>
This change makes sense and works as I'd expect (although the message
is still slightly odd in the -kernel case, but I can't think of
anything better.)
Will you also do a followup removing the trailing punctuation? :)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] s390-ccw: only print boot menu error if -boot menu=on was specified
2018-02-27 19:18 ` Cornelia Huck
@ 2018-02-27 19:29 ` Collin L. Walling
0 siblings, 0 replies; 3+ messages in thread
From: Collin L. Walling @ 2018-02-27 19:29 UTC (permalink / raw)
To: Cornelia Huck; +Cc: thuth, borntraeger, qemu-s390x, qemu-devel, mihajlov
On 02/27/2018 02:18 PM, Cornelia Huck wrote:
> On Tue, 27 Feb 2018 10:19:20 -0500
> "Collin L. Walling" <walling@linux.vnet.ibm.com> wrote:
>
> Nit: make the prefix s390x/ipl:, as this is not directly in the bios.
>
>> It is possible that certain QEMU configurations may not
>> create an IPLB (such as when -kernel is provided). In
>> this case, a misleading error message will be printed
>> stating that the "boot menu is not supported for this
>> device type".
>>
>> To amend this, only print this message iff boot menu=on
>> was provided on the commandline. Otherwise, return silently.
>>
>> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
>> ---
>> hw/s390x/ipl.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
>> index 798e99a..c4addb5 100644
>> --- a/hw/s390x/ipl.c
>> +++ b/hw/s390x/ipl.c
>> @@ -250,7 +250,9 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
>> case S390_IPL_TYPE_QEMU_SCSI:
>> break;
>> default:
>> - error_report("boot menu is not supported for this device type.");
>> + if (boot_menu) {
>> + error_report("boot menu is not supported for this device type.");
>> + }
>> return;
>> }
>>
> This change makes sense and works as I'd expect (although the message
> is still slightly odd in the -kernel case, but I can't think of
> anything better.)
>
> Will you also do a followup removing the trailing punctuation? :)
>
You got it!
--
- Collin L Walling
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-27 19:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-27 15:19 [Qemu-devel] [PATCH] s390-ccw: only print boot menu error if -boot menu=on was specified Collin L. Walling
2018-02-27 19:18 ` Cornelia Huck
2018-02-27 19:29 ` Collin L. Walling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).