aboutsummaryrefslogtreecommitdiff
path: root/pc-bios
diff options
context:
space:
mode:
authorCollin L. Walling <walling@linux.vnet.ibm.com>2018-02-23 10:43:12 -0500
committerThomas Huth <thuth@redhat.com>2018-02-26 07:56:54 +0100
commit26b2a2a49171ff44286722681f5aebdfee23e9cf (patch)
treed4f336a0e30d2f4ba597c4da53df8c8337a44458 /pc-bios
parent118ee80f7921e8b062c445ac3986ee11409520d0 (diff)
s390-ccw: parse and set boot menu options
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. Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com> Reviewed-by: Janosch Frank <frankja@linux.vnet.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/s390-ccw/iplb.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h
index 31d2934762..832bb94440 100644
--- a/pc-bios/s390-ccw/iplb.h
+++ b/pc-bios/s390-ccw/iplb.h
@@ -74,14 +74,19 @@ extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
#define QIPL_ADDRESS 0xcc
+/* Boot Menu flags */
+#define QIPL_FLAG_BM_OPTS_CMD 0x80
+
/*
* This definition must be kept in sync with the defininition
* in hw/s390x/ipl.h
*/
struct QemuIplParameters {
- uint8_t reserved1[4];
+ uint8_t qipl_flags;
+ uint8_t reserved1[3];
uint64_t netboot_start_addr;
- uint8_t reserved2[16];
+ uint32_t boot_menu_timeout;
+ uint8_t reserved2[12];
} __attribute__ ((packed));
typedef struct QemuIplParameters QemuIplParameters;