From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nYimU-0005cn-MF for mharc-grub-devel@gnu.org; Mon, 28 Mar 2022 02:23:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYimF-0005Wt-Ch for grub-devel@gnu.org; Mon, 28 Mar 2022 02:22:57 -0400 Received: from [2607:f8b0:4864:20::534] (port=41948 helo=mail-pg1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYimC-0005F7-Du for grub-devel@gnu.org; Mon, 28 Mar 2022 02:22:55 -0400 Received: by mail-pg1-x534.google.com with SMTP id t13so10242756pgn.8 for ; Sun, 27 Mar 2022 23:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zlD+OpE5Qq+M6A3lg0RBevQa+8dW4C7L8EBNObX1Dg4=; b=m8mefDuy52ylbEQGIIxZaSnKJcYKcD9mvqd+9AOE5wy0ZCxnMPETDwJvv24DCijtA4 xkSxYC09mzFvSfj/RWtTuuqrgE0M5ZIVRaJtZQ2iD5MSvE3N8NdfSQb13j882Ssv6+uI Jlk7seQCKLUMuPjkOsXMAmoWEiHI9S7VP8BK0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zlD+OpE5Qq+M6A3lg0RBevQa+8dW4C7L8EBNObX1Dg4=; b=1ND+uKFYJmCfrcpYknftvJULHi98f7MFUJEBheozaVsYlT8nG/pIU4zg/FoSAhbLsX Fln+r3KSrIJ4LcMqN2uJBO6bxYz47ywbfErBGbJ+MnSgRtLRnnN+f+b2gE5758MjReV2 EHQIA9QaDiQvZxSpUROUkzMnaQ9JcorkGAGExakULzzgeopNbICEJfj3RrClXpZxshkD clYhUGcjwQV47W2lU0qhMIJUvcEKizmkgPEtSwlJ1gXrBZfd8qo5qbgchAxpbv7YIj7r mmv4FvSlP2L1YHxCc7LXXXCPU0xEbnv6sD2ufal1EvPZg651Niy6hwOEB6/vj33NpSBW n1eA== X-Gm-Message-State: AOAM531FkU677Y1pOsdILW8skQDPAtmuJpp503k8w8+8bmTj8+hgpgSU wCnop7eo65gMT4ABl2+/O6rPQH9Q20uDDg== X-Google-Smtp-Source: ABdhPJw4UZtFu+a3YzuYIygvg71EECTKoi9SmxHSs4WS+CzZc3HSs3XTSDQrjxoOfLe9fMmQwdWbaA== X-Received: by 2002:a63:6e49:0:b0:385:fb1c:f432 with SMTP id j70-20020a636e49000000b00385fb1cf432mr8915699pgc.207.1648448570919; Sun, 27 Mar 2022 23:22:50 -0700 (PDT) Received: from localhost ([2001:4479:e000:e400:743e:bc3e:ec72:bf20]) by smtp.gmail.com with ESMTPSA id y12-20020a17090a784c00b001c6bdafc995sm16637408pjl.3.2022.03.27.23.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 23:22:50 -0700 (PDT) From: Daniel Axtens To: grub-devel@gnu.org Cc: leif@nuviainc.com, stefanb@linux.ibm.com, ps@pks.im, dkiper@net-space.pl, Daniel Axtens Subject: [PATCH v2 01/15] grub-shell: only pass SeaBIOS fw_opt in for x86 BIOS platforms Date: Mon, 28 Mar 2022 17:22:26 +1100 Message-Id: <20220328062240.878781-2-dja@axtens.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328062240.878781-1-dja@axtens.net> References: <20220328062240.878781-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::534 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=dja@axtens.net; helo=mail-pg1-x534.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2022 06:22:57 -0000 This breaks the tests on pseries - just restrict it to x86 platforms that don't specify a BIOS. Signed-off-by: Daniel Axtens --- v2: Thanks Daniel K and Glenn for feedback. --- tests/util/grub-shell.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in index 33590baeb13c..4828afb7cc5a 100644 --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -376,7 +376,11 @@ if test -z "$debug"; then # workaround unfortunately causes qemu to issue a warning 'externally # provided fw_cfg item names should be prefixed with "opt/"', but there # doesn't seem to be a better option. - qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0" + # + # SeaBIOS is used for i386, except on EFI. + if [ ${grub_modinfo_target_cpu} == 'i386' ] && [ ${grub_modinfo_platform} != 'efi' ]; then + qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0" + fi fi if [ x$boot != xnet ] && [ x$boot != xemu ]; then -- 2.32.0