From patchwork Wed Mar 12 17:45:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 14013717 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C22DC28B28 for ; Wed, 12 Mar 2025 17:47:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.910629.1317301 (Exim 4.92) (envelope-from ) id 1tsQAr-0006hd-5t; Wed, 12 Mar 2025 17:47:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 910629.1317301; Wed, 12 Mar 2025 17:47:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsQAq-0006gd-Ut; Wed, 12 Mar 2025 17:47:20 +0000 Received: by outflank-mailman (input) for mailman id 910629; Wed, 12 Mar 2025 17:47:19 +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 1tsQAp-0006eC-Nj for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 17:47:19 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0ab2f288-ff6a-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 18:47:18 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43948f77f1aso488235e9.0 for ; Wed, 12 Mar 2025 10:47:18 -0700 (PDT) Received: from andrewcoop.eng.citrite.net (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d0a8d0b79sm27333805e9.36.2025.03.12.10.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 10:47:17 -0700 (PDT) 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: 0ab2f288-ff6a-11ef-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1741801638; x=1742406438; 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=ZqBQFlJTZsCUlmNgAuNEOWwWaFXwc+Wq2W2eNaP76Wc=; b=WUeZe41NoXlxwUsk1Wgbrrrg+Ruf3OflzildEFWS5v1rI1aUHQQFiHR4pDn8COD4c0 Z0p+wh4gwZAOuRn2whCBdov+TjiY3yxd8C0n10xBQ14hRoh7AcOlNxo7aflc3U5aukeJ yDaq8PUi4CyED3VtZp20iM/P/4qk6WoyZBK1E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741801638; x=1742406438; 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=ZqBQFlJTZsCUlmNgAuNEOWwWaFXwc+Wq2W2eNaP76Wc=; b=DiCC4XUHkeeNYnwLgb18J+TV9VTQYJyJVJVvagwtnNq4/uOk+4Fg7pkf/ABfmYx070 Rs5Wy2NQR6gsQdW6y4xxT8mIJ/udYi2sCsaAZxJpiqP+vSwTQWeu29fjc0AafKkSxQGA 2uy75SGLteuSm/vY4OiB7w13Yg3vK1bvyT6DVgUYMpT4SNEAE60OZl6AuZ4nUqu52E5D EJPgL3y9WUgHtNGPSm2rFjvuDPdXB0XB6MjTcsD81Z0l4YczM5nU7sxmnwwK8lDUVfOR ihiaf/DAy8cT8Yqv8sMgh6LyBwmuS74KLxd3B60GqMtKa7IHUrT3mzrvvWH2pXuAvtnF fkgw== X-Gm-Message-State: AOJu0YxR+V+uBx4YWTfs4StyycrgUCNwKrW4TqVjjyv6gJMzyFfgiwda YFSIRw90ADduqR7XFVwGv5wAQqMKJj6n9tMlmASlnzVVq0JCY6MU28HklH6eHUhHeQ7NvLY8NxF v X-Gm-Gg: ASbGncvPbpBcdQsVyNuftjS9qLXyHQ11YO6bYVpWk6+SRiQ7eX66Fy4L727r2EcUWVA 9IHKW782odx5qHYFZA6YSTLruv+IMTX3cifQssM7/VE1IkOGGLxLFmsDgRWOAgRsBO++NDbm0Ma 1HlIgwDS51GnM6L0qwE2w7Sc8m4Zc2Uv7IncaioW6LQ3756imiIhAaPcXiyuG6lfENhwPZI7XNa ptmhLbvTtygRydxDYfYYGBH+buXUEKyQCRqVSpeMD0TAEHtrAWXdQ3FbjpDt97RPGYSvOZf5hI0 9WoD+m1cshBWLpYbHEt1Xbajxcg1CupkvRTffLL1X9UEMdP8RQ6iPyj2l1IzajuDR7RZlIxj0ox XGMvbfq0qNgoRXfbP8zhR+na2 X-Google-Smtp-Source: AGHT+IG6WIQbLyBVw6c1o93+Ab+dfGr34YtfYi/4+2Ny4ovDDLsD2cCOH/9AIuJzZw2tSsUE5Y9zaw== X-Received: by 2002:a05:600c:468b:b0:43c:f00b:d581 with SMTP id 5b1f17b1804b1-43cf00bd768mr120761215e9.29.1741801637594; Wed, 12 Mar 2025 10:47:17 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 1/8] xen/elfstructs: Include xen/types.h Date: Wed, 12 Mar 2025 17:45:05 +0000 Message-Id: <20250312174513.4075066-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250312174513.4075066-1-andrew.cooper3@citrix.com> References: <20250312174513.4075066-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 elfstructs.h needs the stdint.h types. Two headers arrange this manually, but elf.h and livepatch.h do not, which breaks source files whose headers are properly sorted. elfstructs.h is used by tools too, so limit this to Xen only. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Michal Orzel CC: Jan Beulich CC: Julien Grall CC: Roger Pau Monné CC: Stefano Stabellini CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Oleksii Kurochko CC: Shawn Anastasio --- xen/include/xen/elfstructs.h | 7 ++++++- xen/include/xen/livepatch_elf.h | 1 - xen/include/xen/version.h | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) base-commit: 8e60d47cf0112c145b6b0e454d102b04c857db8c diff --git a/xen/include/xen/elfstructs.h b/xen/include/xen/elfstructs.h index eb6b87a823a8..f64ecec01990 100644 --- a/xen/include/xen/elfstructs.h +++ b/xen/include/xen/elfstructs.h @@ -26,6 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* Outside of Xen, the includer must provide stdint.h or equivalent. */ +#ifdef __XEN__ +#include +#endif + typedef uint32_t Elf32_Addr; /* Unsigned program address */ typedef uint32_t Elf32_Off; /* Unsigned file offset */ typedef uint16_t Elf32_Half; /* Unsigned medium integer */ @@ -45,7 +50,7 @@ typedef uint64_t Elf64_Xword; /* * e_ident[] identification indexes - * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html + * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html */ #define EI_MAG0 0 /* file ID */ #define EI_MAG1 1 /* file ID */ diff --git a/xen/include/xen/livepatch_elf.h b/xen/include/xen/livepatch_elf.h index 842111e14518..a8aafecd34b1 100644 --- a/xen/include/xen/livepatch_elf.h +++ b/xen/include/xen/livepatch_elf.h @@ -5,7 +5,6 @@ #ifndef __XEN_LIVEPATCH_ELF_H__ #define __XEN_LIVEPATCH_ELF_H__ -#include #include /* The following describes an Elf file as consumed by Xen Live Patch. */ diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h index 4856ad1b446d..bc69ec9fb029 100644 --- a/xen/include/xen/version.h +++ b/xen/include/xen/version.h @@ -1,7 +1,6 @@ #ifndef __XEN_VERSION_H__ #define __XEN_VERSION_H__ -#include #include const char *xen_compile_date(void);