From nobody Thu Nov 21 20:42:48 2024 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=1725284004; cv=none; d=zohomail.com; s=zohoarc; b=EGP6yKODhjuZtM4gJSGaRostgKEx1ORqwFBpIVJMOO3qVMsJ38iM0wzdiMYdBXX9clEL87leF//qsZtJn3u0n/oiRUqIxjTUrS6e0VPFAaMlPtuHSmmmm53pGE/WYsg5bhbCW9aByO4/wpRTbgMVzFxLk/7WVgN0kDWfpu7XPHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725284004; 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=JkjCsz/TTC6SLbAh60aBVRxv3OTDCBQ4EzpkKj3S5ug=; b=LDh7gHIT+VRE3XvBrSy1hOT9Jg0OO+6cOCIYE1Ynk6WVIKQusldSH2FDSPW2HDSZImB/k0ruY1RNSuiSlNhLV80RCrxnbeSbRXZiTOzD4fAIrV7bijmvfztjbYjGFo96Ntoruhg3608oBtY8fLP8bWXOmRL0dF7qV5N4VvlCa3A= 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 1725284004062465.64589401626176; Mon, 2 Sep 2024 06:33:24 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.787949.1197403 (Exim 4.92) (envelope-from ) id 1sl7Au-0000vU-Pl; Mon, 02 Sep 2024 13:32:56 +0000 Received: by outflank-mailman (output) from mailman id 787949.1197403; Mon, 02 Sep 2024 13:32:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sl7Au-0000vL-Mb; Mon, 02 Sep 2024 13:32:56 +0000 Received: by outflank-mailman (input) for mailman id 787949; Mon, 02 Sep 2024 13:32:54 +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 1sl7As-0000uL-OJ for xen-devel@lists.xenproject.org; Mon, 02 Sep 2024 13:32:54 +0000 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [2a00:1450:4864:20::52d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id daa11806-692f-11ef-99a1-01e77a169b0f; Mon, 02 Sep 2024 15:32:52 +0200 (CEST) Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5c0a9f2b967so4016000a12.2 for ; Mon, 02 Sep 2024 06:32:52 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8989196975sm562333666b.135.2024.09.02.06.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 06:32:50 -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: daa11806-692f-11ef-99a1-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1725283971; x=1725888771; 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=JkjCsz/TTC6SLbAh60aBVRxv3OTDCBQ4EzpkKj3S5ug=; b=Gd1NTWoSjj79AVK9xEMB4IHLESKHqVM9boIALpsRoxvc/aiCNeO4gU2ZN5SgWTqIh7 6anaJ1qvYUdW7aZHhB3ZTQ2bUGizlmhF5Tr543cJdCuC/KvBkxqChd30v6rDQNXrgBHk 0vc3b87MdSCJ4oayUJ42aELX0WCnQh39W+2q4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725283971; x=1725888771; 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=JkjCsz/TTC6SLbAh60aBVRxv3OTDCBQ4EzpkKj3S5ug=; b=E/b4+5ACzQ5bx6SGVBuOoytW1dFOeW1ILhm36dk5VNSmmX0FgBUPt+TxFmZyCeiXNx 2WhtbmG+XNfFRy+tw43BnYOX87KBJRyuIUoRSI8V0YspEzU/lKmkYWsqE4VePj/YnLZ8 sGeMZF62q/JE+QhAmabA0EJfX1hDpTAXu7SYoNSV9O/BCPCuO4bYBZffdeJ+ZbLoPf3/ Ze0wibmx4pN9OmMehEB0sJ+EY2mlAXz/6EwcoW6Ugk3DJ127MgtNlEzbGhZXv78reOrR 3hMF5w+ms/5uy2/riFFX7mao6psw4OVKCeTFdVRr9I1JfUKcbaPJobCoTqVBISbRehsi KPGg== X-Gm-Message-State: AOJu0Yz/qqobozablDF7cPBG+U5MM5tmcOGeT5qVtz8Z24dLnb5e9Lcw Ho2BGPezA+eVYSeXGYm5F+SWd2EWMeXAOhQoY1MuIYAQQ1l0CTL89CDvD9xJCdXxBWb37/vLXFr G X-Google-Smtp-Source: AGHT+IGLiZWsjP904HzU5d+Lqwsu331ymEnmmqjv5MvEuswF7Gkc+QrUPOrkKmjl1yJdP48f1/EmGw== X-Received: by 2002:a17:907:1c9f:b0:a8a:18f9:269f with SMTP id a640c23a62f3a-a8a18f92a81mr42918266b.60.1725283970945; Mon, 02 Sep 2024 06:32:50 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Frediano Ziglio Subject: [PATCH 1/4] x86/boot: Use Date: Mon, 2 Sep 2024 14:32:29 +0100 Message-Id: <20240902133232.3302839-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240902133232.3302839-1-andrew.cooper3@citrix.com> References: <20240902133232.3302839-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: 1725284004686116600 ... rather than opencoding locally. This also covers NULL and *_MAX. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Frediano Ziglio --- xen/arch/x86/boot/cmdline.c | 2 ++ xen/arch/x86/boot/defs.h | 17 ----------------- xen/arch/x86/boot/reloc.c | 2 ++ 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index b8ad7f3a144a..28a47da7ab02 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -31,6 +31,8 @@ asm ( ); =20 #include +#include + #include "defs.h" #include "video.h" =20 diff --git a/xen/arch/x86/boot/defs.h b/xen/arch/x86/boot/defs.h index ee1a4da6af03..cf9a80d116f3 100644 --- a/xen/arch/x86/boot/defs.h +++ b/xen/arch/x86/boot/defs.h @@ -20,14 +20,10 @@ #ifndef __BOOT_DEFS_H__ #define __BOOT_DEFS_H__ =20 -#include - #define __maybe_unused __attribute__((__unused__)) #define __packed __attribute__((__packed__)) #define __stdcall __attribute__((__stdcall__)) =20 -#define NULL ((void *)0) - #define ALIGN_UP(arg, align) \ (((arg) + (align) - 1) & ~((typeof(arg))(align) - 1)) =20 @@ -47,17 +43,4 @@ =20 #define tolower(c) ((c) | 0x20) =20 -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -typedef unsigned long long u64; -typedef unsigned int size_t; -typedef u8 uint8_t; -typedef u16 uint16_t; -typedef u32 uint32_t; -typedef u64 uint64_t; - -#define UINT16_MAX ((uint16_t)(~0U)) -#define UINT_MAX (~0U) - #endif /* __BOOT_DEFS_H__ */ diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 589e026ff9fb..ac8b58b69581 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -26,6 +26,8 @@ asm ( " jmp reloc \n" ); =20 +#include + #include "defs.h" =20 #include --=20 2.39.2