qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
	"Collin L. Walling" <walling@linux.vnet.ibm.com>,
	qemu-devel@nongnu.org, qemu-s390x@nongnu.org
Subject: [Qemu-devel] [PULL-for-s390x 09/14] s390-ccw: print zipl boot menu
Date: Mon, 26 Feb 2018 11:42:32 +0100	[thread overview]
Message-ID: <1519641757-12396-10-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1519641757-12396-1-git-send-email-thuth@redhat.com>

From: "Collin L. Walling" <walling@linux.vnet.ibm.com>

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 <walling@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 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;
-- 
1.8.3.1

  parent reply	other threads:[~2018-02-26 10:43 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-26 10:42 [Qemu-devel] [PULL-for-s390x 00/14] s390-ccw firmware update Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 01/14] s390-ccw: refactor boot map table code Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 02/14] s390-ccw: refactor eckd_block_num to use CHS Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 03/14] s390-ccw: refactor IPL structs Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 04/14] s390-ccw: update libc Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 05/14] s390-ccw: move auxiliary IPL data to separate location Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 06/14] s390-ccw: parse and set boot menu options Thomas Huth
2018-02-26 18:48   ` Cornelia Huck
2018-02-26 19:29     ` [Qemu-devel] [qemu-s390x] " Collin L. Walling
2018-02-26 19:44       ` Collin L. Walling
2018-02-27  9:12         ` Cornelia Huck
2018-02-27  9:22           ` Thomas Huth
2018-02-27 15:04             ` Collin L. Walling
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 07/14] s390-ccw: set up interactive boot menu parameters Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 08/14] s390-ccw: read stage2 boot loader data to find menu Thomas Huth
2018-02-26 10:42 ` Thomas Huth [this message]
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 10/14] s390-ccw: read user input for boot index via the SCLP console Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 11/14] s390-ccw: set cp_receive mask only when needed and consume pending service irqs Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 12/14] s390-ccw: use zipl values when no boot menu options are present Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 13/14] s390-ccw: interactive boot menu for scsi Thomas Huth
2018-02-26 10:42 ` [Qemu-devel] [PULL-for-s390x 14/14] pc-bios/s390: Rebuild the s390x firmware images with the boot menu changes Thomas Huth
2018-02-27  9:30 ` [Qemu-devel] [PULL-for-s390x 00/14] s390-ccw firmware update Cornelia Huck
2018-02-27 17:56 ` Peter Maydell
2018-02-27 18:51   ` Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519641757-12396-10-git-send-email-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=walling@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).