On 02/27/2018 02:18 PM, Cornelia Huck wrote:
On Tue, 27 Feb 2018 10:19:20 -0500
"Collin L. Walling" <wall...@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 <wall...@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
