From nobody Tue Feb 10 02:46:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=eu.citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1589915008; cv=none; d=zohomail.com; s=zohoarc; b=TtCDTwRR/SAbdxWG2PIhTnB79aXTo7wLhqwNGZNJFTCCt5Zg1d4fNHoYyLwyLUQYwHtLet41U48rs8rxf7fjIwqCvzomHwUyEWPe/dMfCPEmSDCBQfgwpp+R76eAZ2atqtih2RIJohsyvuc6lzQy0Q+7omop7NMaH8vtVoqOtxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589915008; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Nw+IX30KtmkGdZN/IQ2TGJe+32DqAFpJ8dx+MimVxJg=; b=AYN4zoxAiTsPeVmb2pRSFrQxTACG+eZaS3Z0lZ57ImH6rNXr7ab3VyWwBFl+GhrcRzUm+p9I7G1w4+vIwCTTZOFw+W+DLmjcqhWAtcJPFGylGYuEbxawguM8GfwvwL5TWF78flTXrXJrRFmxMUXCbWxmx/dPpaRzPh/Austxp/c= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1589915008416262.60206670908667; Tue, 19 May 2020 12:03:28 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7WB-0004lg-U8; Tue, 19 May 2020 19:03:11 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7WB-0004lJ-7w for xen-devel@lists.xenproject.org; Tue, 19 May 2020 19:03:11 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::3]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4d983100-9a03-11ea-b9cf-bc764e2007e4; Tue, 19 May 2020 19:02:37 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1jb7Vc-0001da-6h; Tue, 19 May 2020 20:02:36 +0100 X-Inumbo-ID: 4d983100-9a03-11ea-b9cf-bc764e2007e4 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 07/38] setupboot_grub2: Drop $submenu variable Date: Tue, 19 May 2020 20:01:59 +0100 Message-Id: <20200519190230.29519-8-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519190230.29519-1-ian.jackson@eu.citrix.com> References: <20200519190230.29519-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" We really only used this to check how many levels deep in { we are. That can be done by checking $#offsets, which is >0 if we are in a submenu and not otherwise. We lose the ability to report the start line of the submenu, but that's OK. But as a bonus, we no longer bomb out on nested submenus: previously the first } would cause $submenu to be undef. Now we pop from @offsets and all is fine. Nested submenus are present in Debian buster. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index ba975b87..b8bf67dc 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -452,15 +452,13 @@ sub setupboot_grub2 ($$$$) { my @offsets =3D (0); my $entry; my $chainentry; - my $submenu; while (<$f>) { next if m/^\s*\#/ || !m/\S/; if (m/^\s*\}\s*$/) { - die unless $entry || $submenu; - if (!$entry && $submenu) { - logm("Met end of a submenu $submenu->{StartLine}..$.. = ". + die unless $entry || $#offsets; + if (!$entry && $#offsets) { + logm("Met end of a submenu at $. (@offsets) ". "Our want kern is $want_kernver"); - $submenu=3D undef; pop @offsets; $offsets[$#offsets]++; next; @@ -510,7 +508,6 @@ sub setupboot_grub2 ($$$$) { $offsets[$#offsets]++; } if (m/^\s*submenu\s+[\'\"](.*)[\'\"].*\{\s*$/) { - $submenu=3D{ StartLine =3D>$., MenuEntryPath =3D> join ">"= , @offsets }; push @offsets,(0); } if (m/^\s*chainloader\s*\/EFI\/osstest\/xen.efi/) { --=20 2.20.1