From nobody Sun Sep 14 06:34:54 2025 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; dkim=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1757639774; cv=none; d=zohomail.com; s=zohoarc; b=INeYXnsk0f0NDuuL+SCvDoBQfXqyepOpXFXgg8l19wSSb/iOXTRAoDB/4x62e5Bvu9OTvv6rskcFMOuzTRvaNVk6eHqfkxtZ4brxhbwsRLRSdDabhQ9CmcklR9u2PLPNyMu2iBg3F+Kq18Z8ml6b1lSfAEw/Z04bSn2Ox4XAhCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757639774; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9yPQP1AiZ6MAimirV8m1kgaZtgS1jLjq17yJsft7IsE=; b=G3r4VFZq1S9XolNh7yIw+mWTH3tHhf7LXEK3JV2XlzwoKmJzPA1XXEb4Z/w1An50HQz4OANzb7bN3RwfI7IE1j6gDM2dRwJZbsaLnVMQSpkGW7KE+9q+SADcyFc8zDXFFZSaZtAWaX/tPmPQ/x65cqCxAxvadnF9UQJHb/HPzXI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 175763977427410.278816405270277; Thu, 11 Sep 2025 18:16:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1121157.1465630 (Exim 4.92) (envelope-from ) id 1uwsO4-0007p3-9y; Fri, 12 Sep 2025 01:15:40 +0000 Received: by outflank-mailman (output) from mailman id 1121157.1465630; Fri, 12 Sep 2025 01:15:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uwsO4-0007op-4u; Fri, 12 Sep 2025 01:15:40 +0000 Received: by outflank-mailman (input) for mailman id 1121157; Fri, 12 Sep 2025 01:15:38 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uwsO2-0007oj-TB for xen-devel@lists.xenproject.org; Fri, 12 Sep 2025 01:15:38 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id fd3dc6b3-8f75-11f0-9d13-b5c5bf9af7f9; Fri, 12 Sep 2025 03:15:37 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-45de1084868so6185355e9.2 for ; Thu, 11 Sep 2025 18:15:37 -0700 (PDT) Received: from localhost.localdomain (host-195-149-20-212.as13285.net. [195.149.20.212]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45e016b5a16sm45827245e9.12.2025.09.11.18.15.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 18:15:35 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: fd3dc6b3-8f75-11f0-9d13-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1757639736; x=1758244536; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9yPQP1AiZ6MAimirV8m1kgaZtgS1jLjq17yJsft7IsE=; b=tR3V/War5/2hhpv4VdSlOld/qzfUQl0imMazq9vqJe/GnayYt0awBGsvlHSejry2yk NxZrEFj8ng+CL4jRWGCFqfPFqzcRdNZOGMlppHH3CMIc8Uka3mzR2QkxmG0IRnccb5o2 xTf717XJybf/e3VTvV036uz84S5+P0KXyBsu4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757639736; x=1758244536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9yPQP1AiZ6MAimirV8m1kgaZtgS1jLjq17yJsft7IsE=; b=KrsQU1Udp/hr7fW3mSvZdEK5xn/HpUGKxkd6Yc9s8QvpPtclMvbd5BoGsV2dreOeNP v6cxzYhUEiUY6nOTwu9jmN0Yyb3rJsNot/JYufQbvQ3DSkFhVOgjrD9NWpXo7Nr0RZNA 1zhug99nmMUWd9Ojufydc8qke9kRDAXCl093B2A59mLwXlAG4aoIYeyd43J3TjSEotoN dF48R6oHXCEsnDlJKbevLMEQWc4+tlsG7jj42/7r5pbTllz/xcWobm5TQa77yIPgnwmk yueg9q7xIbvamd6YujJX4DCCf+g7k9+/4jUNDjAM4wj8mrsug5l2YLua5wxJcBny/Vv+ maiQ== X-Gm-Message-State: AOJu0Yx2Q1tnUvC0h0IGDsnf7A9JFGGHozH4fMFuByTszBiB2Ip26a5v MOswuNqRzFQy3ezqmxtmGwneCneOVMyhHnHqKbAfBSi3gH3+CcQleNWPKwmMyeraQVZxPEmVgX7 HsZf0 X-Gm-Gg: ASbGncvxlvTMRH/geofjNZjOxmKvJakbSqUAyXMUU9VbmLSnA+ctO+ACOSnrlEmUud0 Nh8U2ZOY+m+8ZrM1DvDkwN3torH7NHp18hWfZQOi6ixH7s3trU62WdwKltw+bP/pDKZQwVztmss ZQqIcYlEXyrAZU36KZltver5kVOMeP0DibbHazn1B4WS2i2/blia3E7JFpOO/GrF6gNZp/m2kOF 9j3VcR2rBOHTwRTbbGS9df2AphRxQmpSUgYgXiMB1MQHuQdAOvB9MnJKIzB2emwpixSfu1bnT/2 BhN8TNCZx6PUr6U7Q0x4LzqAECBiNAIScHFnSoNlNOPcSuJk4t7Nq0I2kNJtJ/9Pd2dkwF2dncr LrieFQveqni2AsxP0t2LEYFengYuLSfs7U0Z0dkyLdGM6YepaOnVQoOghMTUVTB773nCrjWaa7N Ij9EfdKkonDDY= X-Google-Smtp-Source: AGHT+IG9HHGIndgHY/tm/TceKBExZ0scjb6hvqpU+eCOivtwqyDdIXlG2ig0tHpVFlkCLJtISFnw2A== X-Received: by 2002:a05:600c:1911:b0:459:d5d1:d602 with SMTP id 5b1f17b1804b1-45f211c8371mr9833845e9.3.1757639736369; Thu, 11 Sep 2025 18:15:36 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Shawn Anastasio , Oleksii Kurochko , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Victor Lira , Denis Mukhin Subject: [PATCH v3 3.5/5] CI: Make qemu-smoke-x86-64-gcc-efi compatible with Debian Trixie Date: Fri, 12 Sep 2025 02:15:34 +0100 Message-Id: <20250912011534.1889763-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250911231216.1886818-1-andrew.cooper3@citrix.com> References: <20250911231216.1886818-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1757639775901116600 The OVMF package in Debian Trixie has _4M suffixes on the files. Have scripts/include/xtf-x86-64-efi check for this before falling back to no suffix. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin --- CC: Anthony PERARD CC: Michal Orzel CC: Jan Beulich CC: Julien Grall CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Shawn Anastasio CC: Oleksii Kurochko CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki CC: Victor Lira CC: Denis Mukhin v3.5 * New Speculative testing in progress: https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2035561867 --- automation/scripts/include/xtf-x86-64-efi | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/automation/scripts/include/xtf-x86-64-efi b/automation/scripts= /include/xtf-x86-64-efi index e0d821b3f6fd..ea5f208e8cb3 100644 --- a/automation/scripts/include/xtf-x86-64-efi +++ b/automation/scripts/include/xtf-x86-64-efi @@ -20,6 +20,7 @@ function xtf_arch_setup() { local esp_dir=3D"${WORKDIR}/boot-esp" local efi_dir=3D"${esp_dir}/EFI/BOOT" + local suff=3D =20 # Generate EFI boot environment mkdir -p ${efi_dir} @@ -35,8 +36,13 @@ options=3D${XEN_CMDLINE} kernel=3Dkernel EOF =20 + # Vs older versions, Debian Trixie names the OVMF files with a _4M suf= fix. + if [[ -e ${FW_PREFIX}/OVMF_VARS_4M.fd ]]; then + suff=3D_4M + fi + # NB: OVMF_CODE.fd is read-only, no need to copy - cp ${FW_PREFIX}OVMF_VARS.fd ${WORKDIR} + cp ${FW_PREFIX}OVMF_VARS${suff}.fd ${WORKDIR} =20 export TEST_CMD=3D"${QEMU_PREFIX}qemu-system-x86_64 \ -no-reboot \ @@ -45,7 +51,7 @@ EOF -serial stdio \ -m 512 \ -M q35,kernel-irqchip=3Dsplit \ - -drive if=3Dpflash,format=3Draw,readonly=3Don,file=3D${FW_PREFIX}O= VMF_CODE.fd \ + -drive if=3Dpflash,format=3Draw,readonly=3Don,file=3D${FW_PREFIX}O= VMF_CODE${suff}.fd \ -drive if=3Dpflash,format=3Draw,file=3D${WORKDIR}/OVMF_VARS.fd \ -drive file=3Dfat:rw:${esp_dir},media=3Ddisk,index=3D0,format=3Dra= w \ " --=20 2.39.5