From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ej03j-0000cA-5u for qemu-devel@nongnu.org; Tue, 06 Feb 2018 05:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ej03c-0002nT-Tr for qemu-devel@nongnu.org; Tue, 06 Feb 2018 05:01:03 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54930 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ej03c-0002nE-Op for qemu-devel@nongnu.org; Tue, 06 Feb 2018 05:00:56 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w169x38c111226 for ; Tue, 6 Feb 2018 05:00:51 -0500 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 2fya28rg4y-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 06 Feb 2018 05:00:50 -0500 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Feb 2018 10:00:48 -0000 References: <1517864246-11101-1-git-send-email-walling@linux.vnet.ibm.com> <1517864246-11101-7-git-send-email-walling@linux.vnet.ibm.com> From: Viktor Mihajlovski Date: Tue, 6 Feb 2018 11:00:43 +0100 MIME-Version: 1.0 In-Reply-To: <1517864246-11101-7-git-send-email-walling@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Message-Id: Subject: Re: [Qemu-devel] [PATCH v5 06/12] s390-ccw: parse and set boot menu options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Collin L. Walling" , qemu-s390x@nongnu.org, qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, frankja@linux.vnet.ibm.com, cohuck@redhat.com, thuth@redhat.com, david@redhat.com, alifm@linux.vnet.ibm.com, eblake@redhat.com 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: > > > > > > 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 > Reviewed-by: Janosch Frank > Reviewed-by: Thomas Huth > --- > 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