[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL 02/11] s390/ipl: only print boot menu error if -boot
From: |
Cornelia Huck |
Subject: |
[qemu-s390x] [PULL 02/11] s390/ipl: only print boot menu error if -boot menu=on was specified |
Date: |
Thu, 8 Mar 2018 19:04:14 +0100 |
From: "Collin L. Walling" <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
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 8512aaacf7..fdeaec3a58 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.13.6
- [qemu-s390x] [PULL 00/11] s390x patches for the 2.12 softfreeze, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 02/11] s390/ipl: only print boot menu error if -boot menu=on was specified,
Cornelia Huck <=
- [qemu-s390x] [PULL 04/11] hw/s390x: Add the possibility to specify the netboot image on the command line, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 05/11] numa: we don't implement NUMA for s390x, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 03/11] target/s390x: Remove leading underscores from #defines, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 01/11] hw/s390x/ipl: Bail out if the network bootloader can not be found, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 07/11] vfio-ccw: license text should indicate GPL v2 or later, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 06/11] s390x/sclpconsole: Remove dead code - remove exit handlers, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 08/11] s390x/sclp: proper support of larger send and receive masks, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 09/11] s390x/sclp: clean up sclp masks, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 10/11] pc-bios/s390-ccw: Move string arrays from bootmap header to .c file, Cornelia Huck, 2018/03/08
- [qemu-s390x] [PULL 11/11] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize, Cornelia Huck, 2018/03/08