[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PATCH v9 09/13] s390-ccw: print zipl boot menu
From: |
Collin L. Walling |
Subject: |
[qemu-s390x] [PATCH v9 09/13] s390-ccw: print zipl boot menu |
Date: |
Fri, 23 Feb 2018 10:43:15 -0500 |
When the boot menu options are present and the guest's
disk has been configured by the zipl tool, then the user
will be presented with an interactive boot menu with
labeled entries. An example of what the menu might look
like:
zIPL v1.37.1-build-20170714 interactive boot menu.
0. default (linux-4.13.0)
1. linux-4.13.0
2. performance
3. kvm
Signed-off-by: Collin L. Walling <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
pc-bios/s390-ccw/menu.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
index c1d242f..730d44e 100644
--- a/pc-bios/s390-ccw/menu.c
+++ b/pc-bios/s390-ccw/menu.c
@@ -15,11 +15,42 @@
static uint8_t flag;
static uint64_t timeout;
-int menu_get_zipl_boot_index(const char *menu_data)
+static int get_boot_index(int entries)
{
return 0; /* implemented next patch */
}
+static void zipl_println(const char *data, size_t len)
+{
+ char buf[len + 2];
+
+ ebcdic_to_ascii(data, buf, len);
+ buf[len] = '\n';
+ buf[len + 1] = '\0';
+
+ sclp_print(buf);
+}
+
+int menu_get_zipl_boot_index(const char *menu_data)
+{
+ size_t len;
+ int entries;
+
+ /* Print and count all menu items, including the banner */
+ for (entries = 0; *menu_data; entries++) {
+ len = strlen(menu_data);
+ zipl_println(menu_data, len);
+ menu_data += len + 1;
+
+ if (entries < 2) {
+ sclp_print("\n");
+ }
+ }
+
+ sclp_print("\n");
+ return get_boot_index(entries - 1); /* subtract 1 to exclude banner */
+}
+
void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout)
{
flag = boot_menu_flag;
--
2.7.4
- [qemu-s390x] [PATCH v9 05/13] s390-ccw: move auxiliary IPL data to separate location, (continued)
- [qemu-s390x] [PATCH v9 05/13] s390-ccw: move auxiliary IPL data to separate location, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 03/13] s390-ccw: refactor IPL structs, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 02/13] s390-ccw: refactor eckd_block_num to use CHS, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 06/13] s390-ccw: parse and set boot menu options, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 04/13] s390-ccw: update libc, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 12/13] s390-ccw: use zipl values when no boot menu options are present, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 07/13] s390-ccw: set up interactive boot menu parameters, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 10/13] s390-ccw: read user input for boot index via the SCLP console, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 09/13] s390-ccw: print zipl boot menu,
Collin L. Walling <=
- [qemu-s390x] [PATCH v9 08/13] s390-ccw: read stage2 boot loader data to find menu, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 11/13] s390-ccw: set cp_receive mask only when needed and consume pending service irqs, Collin L. Walling, 2018/02/23
- [qemu-s390x] [PATCH v9 13/13] s390-ccw: interactive boot menu for scsi, Collin L. Walling, 2018/02/23
- Re: [qemu-s390x] [PATCH v9 00/13] Interactive Boot Menu for DASD and SCSI Guests on s390x, Viktor Mihajlovski, 2018/02/23