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 <[email protected]>
This also Fixes qemu iotest 200. Acked-by: Christian Borntraeger <[email protected]> > --- > 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; > } >
