On 05.02.2018 21:57, Collin L. Walling wrote:
> 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 | 52
> +++++++++++++++++++++++++++++++++++++++++++++++++
> hw/s390x/ipl.h | 7 ++++++-
> pc-bios/s390-ccw/iplb.h | 4 +++-
> 3 files changed, 61 insertions(+), 2 deletions(-)
>
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 3e3c3b8..227dccb 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,53 @@ 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:
> + case S390_IPL_TYPE_QEMU_SCSI:
> + flags = &iplb->qipl.boot_menu_flags;
> + timeout = &iplb->qipl.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_CMD_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 +322,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);> +
Maybe it would be safer wrt migration to move that to
s390_ipl_prepare_cpu()?
> return true;
> }
>
[...]
--
Regards,
Viktor Mihajlovski
