From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emipH-0005Uf-CZ for qemu-devel@nongnu.org; Fri, 16 Feb 2018 11:25:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emipC-0002Ng-Da for qemu-devel@nongnu.org; Fri, 16 Feb 2018 11:25:31 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:54446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emipC-0002NF-4A for qemu-devel@nongnu.org; Fri, 16 Feb 2018 11:25:26 -0500 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w1GGOOBH023474 for ; Fri, 16 Feb 2018 11:25:24 -0500 Received: from e14.ny.us.ibm.com (e14.ny.us.ibm.com [129.33.205.204]) by mx0a-001b2d01.pphosted.com with ESMTP id 2g5y75hmyr-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 16 Feb 2018 11:25:24 -0500 Received: from localhost by e14.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 16 Feb 2018 11:25:22 -0500 References: <1518735273-16089-1-git-send-email-walling@linux.vnet.ibm.com> <1518735273-16089-7-git-send-email-walling@linux.vnet.ibm.com> <4ff97ab0-d848-05a4-9ac2-344bd67e73ef@redhat.com> From: "Collin L. Walling" Date: Fri, 16 Feb 2018 11:25:19 -0500 MIME-Version: 1.0 In-Reply-To: <4ff97ab0-d848-05a4-9ac2-344bd67e73ef@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Message-Id: <233a4664-827e-136e-9fa5-cba1ac395614@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [qemu-s390x] [PATCH v6 06/12] s390-ccw: parse and set boot menu options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , qemu-s390x@nongnu.org, qemu-devel@nongnu.org Cc: frankja@linux.vnet.ibm.com, cohuck@redhat.com, david@redhat.com, alifm@linux.vnet.ibm.com, mihajlov@linux.vnet.ibm.com, borntraeger@de.ibm.com, eblake@redhat.com On 02/16/2018 11:20 AM, Thomas Huth wrote: > On 15.02.2018 23:54, 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 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ >> hw/s390x/ipl.h | 9 +++++++-- >> pc-bios/s390-ccw/iplb.h | 6 ++++-- >> 3 files changed, 59 insertions(+), 4 deletions(-) > [....] >> diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h >> index cab8a97..7c3cab8 100644 >> --- a/hw/s390x/ipl.h >> +++ b/hw/s390x/ipl.h >> @@ -60,10 +60,15 @@ typedef struct IplBlockQemuScsi IplBlockQemuScsi; >> >> #define QIPL_ADDRESS 0xcc >> >> +#define BOOT_MENU_FLAG_CMD_OPTS 0x80 >> +#define BOOT_MENU_FLAG_ZIPL_OPTS 0x40 >> + >> struct QemuIplParameters { >> - uint8_t reserved1[4]; >> + uint8_t boot_menu_flags; >> + uint8_t reserved1; >> + uint32_t boot_menu_timeout; >> uint64_t netboot_start_addr; > The netboot_start_addr field is now never aligned anymore, neither on > the host side, nor in guest memory. Not a big problem since the struct > is declared with "QEMU_PACKED", but still ... it's always nicer to try > to align fields to their natural boundaries. So maybe move > boot_menu_flags and reserved1 after netboot_start_addr ? Makes sense. Will fixup. > >> - uint8_t reserved2[16]; >> + uint8_t reserved2[14]; >> } QEMU_PACKED; >> typedef struct QemuIplParameters QemuIplParameters; > Thomas > -- - Collin L Walling