From nobody Fri Oct 31 09:55:32 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