* [Qemu-devel] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified
@ 2018-02-27 19:35 Collin L. Walling
2018-03-01 10:04 ` [Qemu-devel] [qemu-s390x] " Thomas Huth
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Collin L. Walling @ 2018-02-27 19:35 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.
While we're at it, remove trailing periods from error
messages.
Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
---
hw/s390x/ipl.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 798e99a..d7fb33f 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -234,7 +234,7 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
if (!get_boot_device(0)) {
if (boot_menu) {
error_report("boot menu requires a bootindex to be specified for "
- "the IPL device.");
+ "the IPL device");
}
return;
}
@@ -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;
}
@@ -263,13 +265,13 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
tmp = qemu_opt_get(opts, "splash-time");
if (tmp && qemu_strtoul(tmp, NULL, 10, &splash_time)) {
- error_report("splash-time is invalid, forcing it to 0.");
+ error_report("splash-time is invalid, forcing it to 0");
*timeout = 0;
return;
}
if (splash_time > 0xffffffff) {
- error_report("splash-time is too large, forcing it to max value.");
+ error_report("splash-time is too large, forcing it to max value");
*timeout = 0xffffffff;
return;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [qemu-s390x] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified
2018-02-27 19:35 [Qemu-devel] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified Collin L. Walling
@ 2018-03-01 10:04 ` Thomas Huth
2018-03-02 8:51 ` [Qemu-devel] " Christian Borntraeger
2018-03-02 9:31 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2018-03-01 10:04 UTC (permalink / raw)
To: Collin L. Walling, qemu-s390x, qemu-devel; +Cc: borntraeger, cohuck, mihajlov
On 27.02.2018 20:35, Collin L. Walling wrote:
> 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.
>
> While we're at it, remove trailing periods from error
> messages.
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
> ---
> hw/s390x/ipl.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified
2018-02-27 19:35 [Qemu-devel] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified Collin L. Walling
2018-03-01 10:04 ` [Qemu-devel] [qemu-s390x] " Thomas Huth
@ 2018-03-02 8:51 ` Christian Borntraeger
2018-03-02 9:31 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Christian Borntraeger @ 2018-03-02 8:51 UTC (permalink / raw)
To: Collin L. Walling, qemu-s390x, qemu-devel; +Cc: cohuck, thuth, mihajlov
On 02/27/2018 08:35 PM, Collin L. Walling wrote:
> 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.
>
> While we're at it, remove trailing periods from error
> messages.
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
This also Fixes qemu iotest 200.
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> hw/s390x/ipl.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 798e99a..d7fb33f 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -234,7 +234,7 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
> if (!get_boot_device(0)) {
> if (boot_menu) {
> error_report("boot menu requires a bootindex to be specified for "
> - "the IPL device.");
> + "the IPL device");
> }
> return;
> }
> @@ -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;
> }
>
> @@ -263,13 +265,13 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
> tmp = qemu_opt_get(opts, "splash-time");
>
> if (tmp && qemu_strtoul(tmp, NULL, 10, &splash_time)) {
> - error_report("splash-time is invalid, forcing it to 0.");
> + error_report("splash-time is invalid, forcing it to 0");
> *timeout = 0;
> return;
> }
>
> if (splash_time > 0xffffffff) {
> - error_report("splash-time is too large, forcing it to max value.");
> + error_report("splash-time is too large, forcing it to max value");
> *timeout = 0xffffffff;
> return;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified
2018-02-27 19:35 [Qemu-devel] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified Collin L. Walling
2018-03-01 10:04 ` [Qemu-devel] [qemu-s390x] " Thomas Huth
2018-03-02 8:51 ` [Qemu-devel] " Christian Borntraeger
@ 2018-03-02 9:31 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Cornelia Huck @ 2018-03-02 9:31 UTC (permalink / raw)
To: Collin L. Walling; +Cc: qemu-s390x, qemu-devel, borntraeger, thuth, mihajlov
On Tue, 27 Feb 2018 14:35:21 -0500
"Collin L. Walling" <walling@linux.vnet.ibm.com> wrote:
> 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.
>
> While we're at it, remove trailing periods from error
> messages.
>
> Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com>
> ---
> hw/s390x/ipl.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
Thanks, applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-02 9:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-27 19:35 [Qemu-devel] [PATCH v2] s390/ipl: only print boot menu error if -boot menu=on was specified Collin L. Walling
2018-03-01 10:04 ` [Qemu-devel] [qemu-s390x] " Thomas Huth
2018-03-02 8:51 ` [Qemu-devel] " Christian Borntraeger
2018-03-02 9:31 ` Cornelia Huck
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.