Set boot menu options for an s390 guest and store them in
the iplb. These options are set via the QEMU command line
option:
-boot menu=on|off[,splash-time=X]
or via the libvirt domain xml:
<os>
<bootmenu enable='yes|no' timeout='X'/>
</os>
Where X represents some positive integer representing
milliseconds.
Any value set for loadparm will override all boot menu options.
If loadparm=PROMPT, then the menu will be enabled without a
timeout.
The absence of any boot options on the command line will flag
to later use the zipl boot loader values.
Signed-off-by: Collin L. Walling <wall...@linux.vnet.ibm.com>
Reviewed-by: Janosch Frank <fran...@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <th...@redhat.com>
---
hw/s390x/ipl.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
hw/s390x/ipl.h | 11 ++++++++--
pc-bios/s390-ccw/iplb.h | 8 +++++--
3 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 0d06fc1..a1eb8fe 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -23,6 +23,8 @@
#include "hw/s390x/ebcdic.h"
#include "ipl.h"
#include "qemu/error-report.h"
+#include "qemu/config-file.h"
+#include "qemu/cutils.h"
#define KERN_IMAGE_START 0x010000UL
#define KERN_PARM_AREA 0x010480UL
@@ -219,6 +221,56 @@ static Property s390_ipl_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+static void s390_ipl_set_boot_menu(IplParameterBlock *iplb)
+{
+ QemuOptsList *plist = qemu_find_opts("boot-opts");
+ QemuOpts *opts = QTAILQ_FIRST(&plist->head);
+ uint8_t *flags;
+ uint16_t *timeout;
+ const char *tmp;
+ unsigned long result = 0;
+
+ switch (iplb->pbt) {
+ case S390_IPL_TYPE_CCW:
+ flags = &iplb->ccw.boot_menu_flags;
+ timeout = &iplb->ccw.boot_menu_timeout;
+ break;
+ case S390_IPL_TYPE_QEMU_SCSI:
+ flags = &iplb->scsi.boot_menu_flags;
+ timeout = &iplb->scsi.boot_menu_timeout;
+ break;
+ default:
+ error_report("boot menu is not supported for this device type.");
+ return;
+ }
+
+ /* In the absence of -boot menu, use zipl parameters */
+ if (!qemu_opt_get(opts, "menu")) {
+ *flags = BOOT_MENU_FLAG_ZIPL_OPTS;
+ } else if (boot_menu) {
+ *flags = BOOT_MENU_FLAG_BOOT_OPTS;
+
+ tmp = qemu_opt_get(opts, "splash-time");
+
+ if (tmp && qemu_strtoul(tmp, NULL, 10, &result)) {
+ error_report("splash-time value is invalid, forcing it to 0.");
+ *timeout = 0;
+ return;
+ }
+
+ result = (result + 500) / 1000; /* Round and convert to seconds */
+
+ if (result > 0xffff) {
+ error_report("splash-time value is greater than 65535000,"
+ " forcing it to 65535000.");
+ *timeout = 0xffff;
+ return;
+ }
+
+ *timeout = cpu_to_be16(result);
+ }
+}
+
static bool s390_gen_initial_iplb(S390IPLState *ipl)
{
DeviceState *dev_st;
@@ -273,6 +325,9 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
if (!s390_ipl_set_loadparm(ipl->iplb.loadparm)) {
ipl->iplb.flags |= DIAG308_FLAGS_LP_VALID;
}
+
+ s390_ipl_set_boot_menu(&ipl->iplb);
+
return true;
}
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index 8a705e0..48e82cf 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -15,9 +15,14 @@
#include "hw/qdev.h"
#include "cpu.h"
+#define BOOT_MENU_FLAG_BOOT_OPTS 0x80
+#define BOOT_MENU_FLAG_ZIPL_OPTS 0x40
+
struct IplBlockCcw {
uint64_t netboot_start_addr;
- uint8_t reserved0[77];
+ uint8_t reserved0[74];
+ uint16_t boot_menu_timeout;
+ uint8_t boot_menu_flags;
uint8_t ssid;
uint16_t devno;
uint8_t vm_flags;
@@ -51,7 +56,9 @@ struct IplBlockQemuScsi {
uint32_t lun;
uint16_t target;
uint16_t channel;
- uint8_t reserved0[77];
+ uint8_t reserved0[74];
+ uint16_t boot_menu_timeout;
+ uint8_t boot_menu_flags;
uint8_t ssid;
uint16_t devno;
} QEMU_PACKED;
diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h
index 890aed9..fe909d2 100644
--- a/pc-bios/s390-ccw/iplb.h
+++ b/pc-bios/s390-ccw/iplb.h
@@ -14,7 +14,9 @@
struct IplBlockCcw {
uint64_t netboot_start_addr;
- uint8_t reserved0[77];
+ uint8_t reserved0[74];
+ uint16_t boot_menu_timeout;
+ uint8_t boot_menu_flags;
uint8_t ssid;
uint16_t devno;
uint8_t vm_flags;
@@ -48,7 +50,9 @@ struct IplBlockQemuScsi {
uint32_t lun;
uint16_t target;
uint16_t channel;
- uint8_t reserved0[77];
+ uint8_t reserved0[74];
+ uint16_t boot_menu_timeout;
+ uint8_t boot_menu_flags;
uint8_t ssid;
uint16_t devno;
} __attribute__ ((packed));
--
2.7.4
