From nobody Fri Oct 31 04:13:25 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=1749122230; cv=none; d=zohomail.com; s=zohoarc; b=BJH5D+mCQZTatROxjwUiJJbXFajdjbdRVoVTaQE8tbKWY0+WtRVFWp6E7fg/SDqVv+OcfmP5jGMQr2xuOsIt7joKxDIQ+AXsN3LY+VUVOhMwmU+St/8psl0CCM3GSRJxrIblI0TDdOOAEZ3EGEhJuD1K7ev7QiVcKBacDCphZRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749122230; 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=3LwfB2gF9isEgIiM5Co6kyT/fwMQ7m7hvxAgSTzQdrA=; b=Dj6IXmsItlwGinMMXjLoSktbcSvdeTr0qtIxc/hk4bwx8+w1fUQgxXuyMNQivZZk85ts7pjRQR3ompPee6Xz4NM1bEaSmgiSEE6dHA5iMWK8Z8enQcU8uN09ZNDFubOL0LP+mnzpq2GTutgpirJDCsdcVUhNUgGW0hhtG1YhI+Q= 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 1749122230103451.29142850584174; Thu, 5 Jun 2025 04:17:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1006655.1385892 (Exim 4.92) (envelope-from ) id 1uN8aY-0002AA-Ji; Thu, 05 Jun 2025 11:16:50 +0000 Received: by outflank-mailman (output) from mailman id 1006655.1385892; Thu, 05 Jun 2025 11:16:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uN8aY-00029H-EY; Thu, 05 Jun 2025 11:16:50 +0000 Received: by outflank-mailman (input) for mailman id 1006655; Thu, 05 Jun 2025 11:16:49 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uN8aX-0001od-54 for xen-devel@lists.xenproject.org; Thu, 05 Jun 2025 11:16:49 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8f4bc1f5-41fe-11f0-b894-0df219b8e170; Thu, 05 Jun 2025 13:16:43 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3a522224582so484847f8f.3 for ; Thu, 05 Jun 2025 04:16:43 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a526f4c808sm2043887f8f.28.2025.06.05.04.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 04:16:41 -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: 8f4bc1f5-41fe-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1749122202; x=1749727002; 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=3LwfB2gF9isEgIiM5Co6kyT/fwMQ7m7hvxAgSTzQdrA=; b=K+v9MopssMNGw8HdOn+44h2jX56dz8SEVoNkGzOXsEG4kVoud/oRwZv7aM1ZNxnKMr +tdEdh1ltQwa0wAd2aEH4EWq1zczsj06k96uA1QUmdrX5XGTA42c5Ob8g4m5Nmd06482 nSra8EImvrPwU9jRNT9Bi6YgEYKFSySeuSV1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749122202; x=1749727002; 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=3LwfB2gF9isEgIiM5Co6kyT/fwMQ7m7hvxAgSTzQdrA=; b=G0hfG8ij//bJs7FEU8u2lvySdXrr01B62/4Qh/gSyCMNzzTx0cVB9sv6+0WxdHXvKD EhgBzvpWgaO1vERWg2DpFQ8qaxBT/OUpgUGADVQClQNiEXjf+1h+Azyv26fycvxAuKdI r90bF7zYQAXziFaGjtoxQsK+Q6VpBdCrcoa2atIuHTZpnC0Q65UURzPUkd33pCS9fZCT fpzu3xdkDLWROpc7gWbWheDLuKLS1jYNSaGH93MHOoVBXnGAeb60hx7HfPA+yjYx6ilf EYMB/0ufgeI1Kjh8OGf4Py0kr1ZLV897JCMg7MIqh+GEBslGhZFqDurCJDG8fXvVEit3 eoug== X-Gm-Message-State: AOJu0Yw/XfiLQCTENEPBo/Dx0opkewQH4nlNyhIYR7QlOeRrDL/7In+Q OwNDgAXNLiddP3AU7jS5AXUAaUlS4QOP72gxQ+B6kF+aUBgmXcfl2DZZwiTFUMb+dDAHQhMgdAL y0xK4 X-Gm-Gg: ASbGncvflaE856IJXhJbOPAb6+mzQRC9Oj37KFas1DfxfBBTWKl+FV9cAgCp+tpj7Kg ztXOPtGi+7VsKlErKtxzEXAHC3bf1YPZ9y2CKRHn8mVVssORQf5sxUiiDE0oNfA/Ppibh+HFZIx 3gJknJ7d3BpaSyi82wvG12VnXuQW6BquvMRjnvv9Qu+bJFrLJUQaxRc28gGztFolo372I4EnDYr IalWfDkPk6kYFGUMU5LE+AJMvtR6Pe9zM09yM2IZZQg3aduMpl6rffTDVmH+Obzmndto4HIQzw+ MCQRvhJsldLeV98WLeSlcDhcKS8AFaa3gwvZ8uL0Y576+Yq6BM0TmKIVw38A0/mM7wge/KCbfn/ xhQo6no/dDEAYo6Ie5CWcvlGw X-Google-Smtp-Source: AGHT+IFVlMhltrqqcKZXTRbuUVmCW3hd9rmmakfK2vK2/mAGdohruOl3xoKC6/s8KgnJs25bYvBvig== X-Received: by 2002:a05:6000:2c0f:b0:3a4:eecf:b8cb with SMTP id ffacd0b85a97d-3a51dbe3d35mr5517306f8f.28.1749122202237; Thu, 05 Jun 2025 04:16:42 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Ross Lagerwall , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , "Daniel P . Smith" Subject: [PATCH 1/3] x86/EFI: Fix detection of buildid Date: Thu, 5 Jun 2025 12:16:36 +0100 Message-Id: <20250605111638.2869914-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250605111638.2869914-1-andrew.cooper3@citrix.com> References: <20250605111638.2869914-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: 1749122230642116600 The format of the buildid is a property of the binary, not a property of how it was loaded. This fixes buildid recognition when starting xen.efi from i= t's MB2 entrypoint. Suggested-by: Ross Lagerwall Signed-off-by: Andrew Cooper Acked-by: Daniel P. Smith Acked-by: Marek Marczykowski-G=C3=B3recki Reviewed-by: Frediano Ziglio Reviewed-by: Roger Pau Monn=C3=A9 --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Ross Lagerwall CC: Marek Marczykowski-G=C3=B3recki CC: Daniel P. Smith I don't like this patch and tried hard to do it in a better way, but the EFI aspects of the build system are too intractable. While on x86 I can in principle pull the same common-stubs.o trick, split on XEN_BUILD_PE rather than XEN_BUILD_EFI, that doesn't work on ARM which hand-codes it's PE-ness. Also, it's really not EFI related, other than as a consequence of that being the only reason we use PE32+ binaries. Binutils 2.25 is now the minimum, and the makefiles can be cleaned up somewhat, but I need to backport this patch, internally at least. --- xen/common/version.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/common/version.c b/xen/common/version.c index 5474b8e385be..56b51c81d2fc 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -203,8 +203,11 @@ void __init xen_build_init(void) rc =3D xen_build_id_check(n, sz, &build_id_p, &build_id_len); =20 #ifdef CONFIG_X86 - /* Alternatively we may have a CodeView record from an EFI build. */ - if ( rc && efi_enabled(EFI_LOADER) ) + /* + * xen.efi built with a new enough toolchain will have a CodeView reco= rd, + * not an ELF note. + */ + if ( rc ) { const struct pe_external_debug_directory *dir =3D (const void *)n; =20 --=20 2.39.5 From nobody Fri Oct 31 04:13:25 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=1749122232; cv=none; d=zohomail.com; s=zohoarc; b=Y7Xy4pt3mvjIdeCB4qvjY2iHDnqpmVoZ5A8e2Np2tbcCcyaUyZjoWUNbrfPfO4whNwPuQ4iDST350ky6RtI48Zn9Q357Lx7E/L6LWai/VvknpmvIlZEMtgw7gSipogdkMUYRiFiV/lKzhrP+oEiLVrEQmb+5Pprup/KHC9xUaz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749122232; 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=moO8xlFiAerCznDfAfTky8HoC4xQsYEV2DeeU3FdPhg=; b=RG6ViW3R6a8ylFSA8n9/SJTznXeh3oX77JxWzv24/l30JH9PrgT+PJfViDyXN55is4P922ppSl9FPpGriwOCIxN01wvpvI25DY2y8oeR51pg4XCTDi8E7LZd0VmVPhoOMumdwg26Nwfu9epvZtwx1vQ993eg5f49hXJyHVESNKs= 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 1749122232131846.8482070746647; Thu, 5 Jun 2025 04:17:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1006653.1385873 (Exim 4.92) (envelope-from ) id 1uN8aU-0001hU-6Q; Thu, 05 Jun 2025 11:16:46 +0000 Received: by outflank-mailman (output) from mailman id 1006653.1385873; Thu, 05 Jun 2025 11:16:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uN8aU-0001gp-11; Thu, 05 Jun 2025 11:16:46 +0000 Received: by outflank-mailman (input) for mailman id 1006653; Thu, 05 Jun 2025 11:16:45 +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 1uN8aT-0001e1-2R for xen-devel@lists.xenproject.org; Thu, 05 Jun 2025 11:16:45 +0000 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [2a00:1450:4864:20::329]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8fc205c0-41fe-11f0-a300-13f23c93f187; Thu, 05 Jun 2025 13:16:43 +0200 (CEST) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so10156165e9.1 for ; Thu, 05 Jun 2025 04:16:43 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a526f4c808sm2043887f8f.28.2025.06.05.04.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 04:16:42 -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: 8fc205c0-41fe-11f0-a300-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1749122203; x=1749727003; 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=moO8xlFiAerCznDfAfTky8HoC4xQsYEV2DeeU3FdPhg=; b=onuiSKS/0D09FV8xaJ8IZzr4/Wt+HEwXxA38psVQlx9Q8318qdQFOo6AQ9otNHNpna n7Uq4XuBN2luhG0dobe/mVVblLVBGOvE7JwkSKTtSG4qr9xA06XLWAqIwYShvdvWw83U LtE54n4a+6DWUgA7jXsXpm+Dbq/kUdGRHA1x4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749122203; x=1749727003; 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=moO8xlFiAerCznDfAfTky8HoC4xQsYEV2DeeU3FdPhg=; b=lFdDTZktUAKLoboaVoisQ5Bz1lWl+W+yLm4SeuHAoj17EPiRHw/wboS3s8Abw/YsKG O4ZFJrweT2WWTRcejlz7USzPejMRCdC7PzRQG7EEbVb6agD7aUSwhZ1HUzdEYQMyjbxI SuIBc14KvEdjcFauUs9Es3z1SFupggiCjC8l9fCVeh48dENG9wlZiOOake8WgPjcahyy ptacXuPgIVOGY6Ja/4kB/NQdOzCLZ212V2B1+WsaPCPMNUsctReH4lIe1bXuIrI0ImhC akAzwGqZoV4cU0aflcyqXnWUkfSSGp1MLIOu7/zichnkBY9qfDFt3AMQWdo3qW+zOxBj 65Jw== X-Gm-Message-State: AOJu0Yy1c25T3eMiJKqNM/EJr8uNu3KIS/xedD871Hji9HFlLYkdX2V3 AmRBNzWggk88NKaoXUoszwmhbmF4PtarCf4cUAj6gzQ714yLUpEWnVI80a5a6KeoTCeL7Yr5e1+ Id5b/ X-Gm-Gg: ASbGncuovaNHsbmqo8QGH08vFTuELt+wnIhBobiIlfRzlGcWisUi3KO6sNst4GG1bY5 TGTXM2oZeidA7gZk9zl025iPaxrn+NzZw7FHBKqVPwWFMQeZ9kv5FmjWVsowLRNtKOv2IltvW9i IvuooF+VE8dfMUDVdp5PiRUmz8ML+R5x+0wGnGkwYwJorgNdngVHB7+uXrGxmV2IRk2UxpVHzZ4 y86HZ0GvbzqZfUYZXC8aCfEjNIGD5pkrkbQucBqbi/KNKRnsJbp62J3aq3wR2Squ6pEHxOhsQ1K rQiWldNXBwsvymDcaHWBEbKWHogVElijVxhK05NzRJXMFcms9ggAAnq3WDkQTvb330kuXL180Hf S4bxEfKV06P+6MxWhNE++CDWkYJT9mLAesmI5MSaJdV7fzw== X-Google-Smtp-Source: AGHT+IH8mOB4XgF/U6YfkV/aYOXYekYBKPq8fbc96Y8Ht/wd2TKdqPhACM6OFgroSNmkOMZhrwxP3Q== X-Received: by 2002:a05:6000:1ac9:b0:3a4:f439:e715 with SMTP id ffacd0b85a97d-3a51d8f6356mr5352020f8f.9.1749122203120; Thu, 05 Jun 2025 04:16:43 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Ross Lagerwall , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , "Daniel P . Smith" Subject: [PATCH 2/3] x86/EFI: Explain buildid.ihex Date: Thu, 5 Jun 2025 12:16:37 +0100 Message-Id: <20250605111638.2869914-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250605111638.2869914-1-andrew.cooper3@citrix.com> References: <20250605111638.2869914-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: 1749122232635116600 This is an awful lot of magic to only be explained in a commit message. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Marek Marczykowski-G=C3=B3recki --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Ross Lagerwall CC: Marek Marczykowski-G=C3=B3recki CC: Daniel P. Smith --- xen/arch/x86/efi/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index c6678652fc98..3e88f552d20b 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -6,6 +6,8 @@ cmd_objcopy_o_ihex =3D $(OBJCOPY) -I ihex -O binary $< $@ $(obj)/%.o: $(src)/%.ihex FORCE $(call if_changed,objcopy_o_ihex) =20 +# buildid.ihex is an empty COFF object. It exists for the side effect it = has +# when linking into xen.efi, causing --build-id to attach a .buildid secti= on. $(obj)/boot.init.o: $(obj)/buildid.o =20 $(call cc-option-add,cflags-stack-boundary,CC,-mpreferred-stack-boundary= =3D4) --=20 2.39.5 From nobody Fri Oct 31 04:13:25 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=1749122228; cv=none; d=zohomail.com; s=zohoarc; b=PYkGUS2du25Pg71fvt74K3wxBINmovHJPrckRLzDg9bvsr7YMPF7Ndc+DUOpEntj5CBv9g2tovp5Gvc0tB+Ml5kXmL0C6Kmw3fHnpHJMS5wLAikACHYKZrj/X3MrirN0gwcz5BAAB+KmykVaNqqgQng3+JpPUVs94uL++TQlOu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749122228; 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=Um/nkv4z1T0RX+MCLdrgS/PNaKhUEklnqmf1PU4WKtE=; b=IV/QwKY41UwpwsvWtsPEXNFcSHRq/Kx2Y/ogJeX7GImN7INXycAz8UJ2LUJNQ6z3+0dW3pl1qwC/fxpzHSDB24xGO+mFOiCcw4QbASpJ/ZOICW0WUNR+r7JDOz8Uk6LYQucQFdf6BibtCSk/WwuS6mimZtafOjBdgJNwLdirFes= 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 1749122228114331.93652736058937; Thu, 5 Jun 2025 04:17:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1006654.1385886 (Exim 4.92) (envelope-from ) id 1uN8aY-00027h-Aa; Thu, 05 Jun 2025 11:16:50 +0000 Received: by outflank-mailman (output) from mailman id 1006654.1385886; Thu, 05 Jun 2025 11:16:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uN8aY-00027W-7S; Thu, 05 Jun 2025 11:16:50 +0000 Received: by outflank-mailman (input) for mailman id 1006654; Thu, 05 Jun 2025 11:16:48 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uN8aW-0001od-UT for xen-devel@lists.xenproject.org; Thu, 05 Jun 2025 11:16:48 +0000 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [2a00:1450:4864:20::429]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 904183ee-41fe-11f0-b894-0df219b8e170; Thu, 05 Jun 2025 13:16:44 +0200 (CEST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3a365a6804eso613747f8f.3 for ; Thu, 05 Jun 2025 04:16:44 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a526f4c808sm2043887f8f.28.2025.06.05.04.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 04:16:43 -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: 904183ee-41fe-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1749122204; x=1749727004; 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=Um/nkv4z1T0RX+MCLdrgS/PNaKhUEklnqmf1PU4WKtE=; b=Bdumjplz8pwYL8jhZNoztKAqyYB5f1NNP+g4QfB1uhf0jXjCoblXOUGlq7ruVAzFrX wFsFYbVauzBBGhLRPPlFprob2FMvDP6VQAuXkvopZeDAsBLnxfDyM21PVjFz4iGInBnP 5fXpubdlmSwM/0YUWiIWI6AzlMwS1JlN9MVUI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749122204; x=1749727004; 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=Um/nkv4z1T0RX+MCLdrgS/PNaKhUEklnqmf1PU4WKtE=; b=JP1Pq6977CGNNukhdTQYFUaDnV/v7znayybVT+DkauvRBtTg3z3beybHl5kjoz4/X9 LXY4E+drxClbjRkYWUTt+WKawF5mlaO7LA5wFfWVt7xTdBxZaSiKaxFu2Ah8nlYNcM0u GguICxTA9lUsa07vD9eu9swPNLnSWFSDcqNfMi1A3A/naXKA1RAVeTyEhN1e7qk7S6oI 28wfO84X4W4DCpqfrmXDsjcx80B322msB+btaH2ERrjyj2RmBSuMEp0vyWa/xHZLHJED 1C+J4e5gsw7jwX0gSQcknY3grBE+BsQUpo4619mdYAdJcTZBrF2IcruB2/cdHKQ+P9Tg Kl5g== X-Gm-Message-State: AOJu0YzLgkSytrVTnHP3XZPwiNHBHQbVrl8U+3D4jUwJoLWlHZrYkMrc FW1HvI1VneP3yPaGK8ugttqOefW5nAHgb1iGMWo6YusPSR2RY4c5agBcJe0faT5pKFuDuf4HX67 +mRQ8 X-Gm-Gg: ASbGncvtwu2ezyXPW1dgbQ+QBWh1dsnfh9qpdFBEjjV/GIs10LNnrR08fonVUe5Z3gn Yhqj9DLgcXHSbmZli2gC8/HH1ja9t+oa9tfCwX11y9ejKwN6fSActALk3rpOUVX5HJL15T6izkR 0V2sCdMOxP/y3AwwzhGmyQ2N3EAHv9ur6DhH04oZlDusKji/LT5vryFVIlSJP7Fg6cNKZ+ZG3YJ IL55BQktxe5YUWMf9TK7UkahDlxfbf2UffuGjqi9f/S8pOVoyvHEGU5tTdhgTBIzKQmqyZwuuE1 A2MTrg4dA/dFwplRcD1Z0TiRax9DgSbqrKwsaptyxr4VAljjxDC6dAPvf/2SBWLMLHI2sXxEBlS sBXRKdmcaDPxgGtPWH6q6RPI3yB5ZNc2J5Vc= X-Google-Smtp-Source: AGHT+IHXbx1ROPnuIC7JMFjjz7VrKMTObMdKBp/S6c+zhNrVde8FiJm0pu5OtqfXMn/ts1xC8RB3lA== X-Received: by 2002:a05:6000:2384:b0:3a4:eef5:dece with SMTP id ffacd0b85a97d-3a51d958744mr4428248f8f.35.1749122203934; Thu, 05 Jun 2025 04:16:43 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Ross Lagerwall , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , "Daniel P . Smith" Subject: [PATCH 3/3] xen/EFI: Drop __ASSEMBLY__ ifdefary in efi.h Date: Thu, 5 Jun 2025 12:16:38 +0100 Message-Id: <20250605111638.2869914-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250605111638.2869914-1-andrew.cooper3@citrix.com> References: <20250605111638.2869914-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: 1749122228623116600 There's already C outside of the ifdefary, proving that it's not included in any assembly files. No functional change. Signed-off-by: Andrew Cooper Acked-by: Daniel P. Smith Acked-by: Jan Beulich Acked-by: Marek Marczykowski-G=C3=B3recki --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Ross Lagerwall CC: Marek Marczykowski-G=C3=B3recki CC: Daniel P. Smith --- xen/include/xen/efi.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 160804e29444..623ed2ccdf31 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -1,9 +1,7 @@ #ifndef __XEN_EFI_H__ #define __XEN_EFI_H__ =20 -#ifndef __ASSEMBLY__ #include -#endif =20 #define EFI_INVALID_TABLE_ADDR (~0UL) =20 @@ -23,8 +21,6 @@ struct efi { =20 extern struct efi efi; =20 -#ifndef __ASSEMBLY__ - union xenpf_efi_info; union compat_pf_efi_info; =20 @@ -53,6 +49,4 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op); int efi_compat_get_info(uint32_t idx, union compat_pf_efi_info *info); int efi_compat_runtime_call(struct compat_pf_efi_runtime_call *op); =20 -#endif /* !__ASSEMBLY__ */ - #endif /* __XEN_EFI_H__ */ --=20 2.39.5