From nobody Sat Nov 15 14:09:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752010161; cv=none; d=zohomail.com; s=zohoarc; b=PTLsaadgtq0LHCVOiReabCQlJaWD5/8Rf69TL/rCIuwYTbD+CbBSNhJ2oeo0XysVA0XEKk/u3gWNQty4GgI825eXi787MN3Z8U2Oe4WNI094iwgYMUdZzx5iZ4nY752ErgrDUajJNx73E95f9ovshyfFhmnUy55bxk1LxLq0ycQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752010161; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XphjHwPaAFIZY0wPtsSOIv7+zbi80IEATDR5be2xxNY=; b=kxGtDISAr+W2amuKIabgzkZV3fPllFcX+SGISAgEpdjR007ptIj18tOfh7Hae1BTyI3e7GT3cw3tx6prb0sqe8wOz35sEePGFqb70VtEcMCP1SIPxT9UNcgnR/VBxf7YrfyXkjDLkXCaaEwnE1Pscn31+Q1j40C9oD3Y5+AJxzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752010161318489.9652504909062; Tue, 8 Jul 2025 14:29:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uZFAl-000434-NJ; Tue, 08 Jul 2025 16:44:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uZDnA-00048a-P0 for qemu-devel@nongnu.org; Tue, 08 Jul 2025 15:16:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uZDmy-00076O-CJ for qemu-devel@nongnu.org; Tue, 08 Jul 2025 15:15:44 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-385-St1CX3E8MRa0UtJ7Qfh_rw-1; Tue, 08 Jul 2025 08:56:46 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6093F18089B5; Tue, 8 Jul 2025 12:56:45 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-196.str.redhat.com [10.33.192.196]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EE84419560AB; Tue, 8 Jul 2025 12:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752002130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XphjHwPaAFIZY0wPtsSOIv7+zbi80IEATDR5be2xxNY=; b=KU5+WNwd67Sv/DU8/Ai5Mo5Sn4x5P2B37Jz6nqyxywZ6YZu7b8qAC22tuK7CvBKIiIp8+/ yfj0djKOCS5HiLPH6mDGvz5jTvTFnx3hU7wanWu2mT4V0jYLcbGLDoCkNjENDRJw/0CFcZ 0jWwU+9UAnsSfJeDLYuUFFWN5/PmPtE= X-MC-Unique: St1CX3E8MRa0UtJ7Qfh_rw-1 X-Mimecast-MFC-AGG-ID: St1CX3E8MRa0UtJ7Qfh_rw_1751979405 From: Thomas Huth To: qemu-devel@nongnu.org, Jared Rossi , Zhuoying Cai Cc: qemu-s390x@nongnu.org, Christian Borntraeger , Eric Farman , Halil Pasic , Matthew Rosato Subject: [PATCH 4/5] pc-bios/s390-ccw: Add a boot menu for booting via pxelinux.cfg Date: Tue, 8 Jul 2025 14:56:29 +0200 Message-ID: <20250708125630.58676-5-thuth@redhat.com> In-Reply-To: <20250708125630.58676-1-thuth@redhat.com> References: <20250708125630.58676-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752010162248116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Show a simple boot menu for pxelinux.cfg, too, if the user requested it. Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/netmain.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c index 4f77635fb86..e2e408fd535 100644 --- a/pc-bios/s390-ccw/netmain.c +++ b/pc-bios/s390-ccw/netmain.c @@ -332,6 +332,28 @@ static int load_kernel_with_initrd(filename_ip_t *fn_i= p, return rc; } =20 +static int net_boot_menu(int num_ent, int def_ent, + struct pl_cfg_entry *entries) +{ + bool valid_entries[MAX_BOOT_ENTRIES] =3D { false }; + int idx; + + puts("\ns390-ccw pxelinux.cfg boot menu:\n"); + printf(" [0] default (%d)\n", def_ent + 1); + valid_entries[0] =3D true; + + for (idx =3D 1; idx <=3D num_ent; idx++) { + printf(" [%d] %s\n", idx, entries[idx - 1].label); + valid_entries[idx] =3D true; + } + putchar('\n'); + + idx =3D menu_get_boot_index(valid_entries); + putchar('\n'); + + return idx; +} + static int net_select_and_load_kernel(filename_ip_t *fn_ip, int num_ent, int selected, struct pl_cfg_entry *entries) @@ -342,6 +364,10 @@ static int net_select_and_load_kernel(filename_ip_t *f= n_ip, return -1; } =20 + if (menu_is_enabled_enum() && num_ent > 1) { + loadparm =3D net_boot_menu(num_ent, selected, entries); + } + if (loadparm > num_ent) { printf("Error: loadparm is set to entry #%d, but there are only " "%d entries in the pxelinux.cfg file!\n" --=20 2.50.0