qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
	Jared Rossi <jrossi@linux.ibm.com>
Subject: [PULL 06/15] pc-bios/s390-ccw: Make get_boot_index() from menu.c global
Date: Fri, 11 Jul 2025 11:33:31 +0200	[thread overview]
Message-ID: <20250711093340.608485-7-thuth@redhat.com> (raw)
In-Reply-To: <20250711093340.608485-1-thuth@redhat.com>

From: Thomas Huth <thuth@redhat.com>

We are going to reuse this function for selecting an entry from
the pxelinux.cfg menu, so rename this function with a "menu_"
prefix and make it available globally.

Reviewed-by: Jared Rossi <jrossi@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250709083443.41574-4-thuth@redhat.com>
---
 pc-bios/s390-ccw/s390-ccw.h | 1 +
 pc-bios/s390-ccw/menu.c     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 6cdce3e5e5b..b1dc35cdedf 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -87,6 +87,7 @@ int menu_get_zipl_boot_index(const char *menu_data);
 bool menu_is_enabled_zipl(void);
 int menu_get_enum_boot_index(bool *valid_entries);
 bool menu_is_enabled_enum(void);
+int menu_get_boot_index(bool *valid_entries);
 
 #define MAX_BOOT_ENTRIES  31
 
diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
index 84062e94af4..eeaff78f870 100644
--- a/pc-bios/s390-ccw/menu.c
+++ b/pc-bios/s390-ccw/menu.c
@@ -159,7 +159,7 @@ static void boot_menu_prompt(bool retry)
     }
 }
 
-static int get_boot_index(bool *valid_entries)
+int menu_get_boot_index(bool *valid_entries)
 {
     int boot_index;
     bool retry = false;
@@ -224,7 +224,7 @@ int menu_get_zipl_boot_index(const char *menu_data)
     }
 
     printf("\n");
-    return get_boot_index(valid_entries);
+    return menu_get_boot_index(valid_entries);
 }
 
 int menu_get_enum_boot_index(bool *valid_entries)
@@ -247,7 +247,7 @@ int menu_get_enum_boot_index(bool *valid_entries)
     }
 
     printf("\n");
-    return get_boot_index(valid_entries);
+    return menu_get_boot_index(valid_entries);
 }
 
 void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout)
-- 
2.50.0



  parent reply	other threads:[~2025-07-11  9:36 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-11  9:33 [PULL 00/15] functional tests and s390x patches Thomas Huth
2025-07-11  9:33 ` [PULL 01/15] target/s390x/kvm: Use vaddr in find/insert_hw_breakpoint() Thomas Huth
2025-07-11  9:33 ` [PULL 02/15] target/s390x/tcg: Use vaddr in s390_probe_access() Thomas Huth
2025-07-11  9:33 ` [PULL 03/15] hw/s390x/s390-pci-bus.c: Use g_assert_not_reached() in functions taking an ett Thomas Huth
2025-07-11  9:33 ` [PULL 04/15] pc-bios/s390-ccw: Allow to select a different pxelinux.cfg entry via loadparm Thomas Huth
2025-07-11  9:33 ` [PULL 05/15] pc-bios/s390-ccw: Allow up to 31 entries for pxelinux.cfg Thomas Huth
2025-07-11  9:33 ` Thomas Huth [this message]
2025-07-11  9:33 ` [PULL 07/15] pc-bios/s390-ccw: Add a boot menu for booting via pxelinux.cfg Thomas Huth
2025-07-11  9:33 ` [PULL 08/15] tests/functional: Add a test for s390x pxelinux.cfg network booting Thomas Huth
2025-07-11  9:33 ` [PULL 09/15] pc-bios/s390-ccw: link statically Thomas Huth
2025-07-11  9:33 ` [PULL 10/15] pc-bios: Update the s390 bios images with the pxelinux.cfg loadparm changes Thomas Huth
2025-07-11  9:33 ` [PULL 11/15] tests/functional: Add dependency to the keymap_targets Thomas Huth
2025-07-11  9:33 ` [PULL 12/15] tests/functional/test_ppc_bamboo: Replace broken link with working assets Thomas Huth
2025-07-11  9:33 ` [PULL 13/15] target/s390x: Remove unused s390_cpu_[un]halt() user stubs Thomas Huth
2025-07-11  9:33 ` [PULL 14/15] target/s390x: Expose s390_count_running_cpus() method Thomas Huth
2025-07-11  9:33 ` [PULL 15/15] target/s390x: Have s390_cpu_halt() not return anything Thomas Huth
2025-07-13  7:06 ` [PULL 00/15] functional tests and s390x patches Stefan Hajnoczi

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=20250711093340.608485-7-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=jrossi@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.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).