From patchwork Mon Nov 13 14:38:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13454057 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 A3108C4332F for ; Mon, 13 Nov 2023 14:39:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.631622.985168 (Exim 4.92) (envelope-from ) id 1r2Y5c-0003Iw-FZ; Mon, 13 Nov 2023 14:39:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 631622.985168; Mon, 13 Nov 2023 14:39:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r2Y5c-0003Ip-Cl; Mon, 13 Nov 2023 14:39:00 +0000 Received: by outflank-mailman (input) for mailman id 631622; Mon, 13 Nov 2023 14:38:59 +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 1r2Y5a-0003Ic-Tp for xen-devel@lists.xenproject.org; Mon, 13 Nov 2023 14:38:59 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20600.outbound.protection.outlook.com [2a01:111:f400:7e1b::600]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 60a51cac-8232-11ee-98da-6d05b1d4d9a1; Mon, 13 Nov 2023 15:38:57 +0100 (CET) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by PR3PR04MB7484.eurprd04.prod.outlook.com (2603:10a6:102:8d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.14; Mon, 13 Nov 2023 14:38:55 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::eb8e:fa24:44c1:5d44%3]) with mapi id 15.20.7002.015; Mon, 13 Nov 2023 14:38:55 +0000 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: 60a51cac-8232-11ee-98da-6d05b1d4d9a1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TVy1UI2q4sZJ3FShapl/LK6nOYNGguRkTYSYBS/YG9hbw8k1yDxtcQlssta8PNn8jGbU8DFCB1nIgbDtjsY7Pg1BIvZGIWrr0ZLTVhfgjq9swq9ScDZD+72NLTTQLgqyT+0+RsGUpj4Tx74ZdbfA7rR40mbtzUx2g/O5yHxBr1dEsBgglOZyWSJG/NDlcC+fzHAoYeWCKMV3mrIj3r5Upog9N+0BvMt3pDHTjr1HPm7LDnWi9xwp26D9zKi8Cz97U8Ty9A7T+BuK04Plfk6KpmPaPTADvn3QxMubNyonnP/x7eURIU7L4lWJdN1QtKLT+9m5OpLE4vr896c596s8PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KkWuOwMICPqm0UI5WQ79zEs8uniG2Cfp+jfiExAlWbk=; b=floN308bFgNKdMj/i1yLs5uSr43Ql7J7lUzqI3A5BkKIDUIgt/rLJLTGSlksPQijWVVDKzmBq3a3LQu7AqpnjUnBHW/IlUCcIglEVU+eebNJikArvoRzArZiGNJQluFmlzvWxsnz2pGfW2PKQwluafcNxLx02jKg4srZZl8Bc0wHOFOk5NN+PsviA/0IJphuxSlzKfmLAdoF0NIv/+MppOYcZAZ1KERokn5nseFNgtT6VD5R76Veio4O8o5vYyK8hLhArVQa8j6iuN+wE1u1HNft4OiKlmwVp6Ncn640zWfCBZaT/gOMZFBNLsd2t1vPjya9jamRZV9NTZpkWs1Jow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KkWuOwMICPqm0UI5WQ79zEs8uniG2Cfp+jfiExAlWbk=; b=txeEvITgbXd4X2SNUTGMh8w6DWNhy3kJcVWT4sGPXNNxYCN+HAFiIJbK79Ybpjd1kSmA7TbhyRB1N810RchpP1MYUC31zsZgfvSVkSmIydshMjk6IGr7N1Oumyh/PgPFkXiWi8p/fR52Pa0vRhWBf/alzd0X7BP7zo5lRbttT15e8ovgqzR7kEiOA9gRKJ7k4OdA07Osb0jF4dquGncd1u2gZS0TyYhAHQDgvnDNCEKidEkeEHsLPFk8qIPAsKQaPjkbXPHjWh/Po2OQvbVbArbelRqNWttwz+UH4QxgCsrVA9n9GsC9VXsiZmm5tvEUbmrkxJe0UKD6XuuWVCUD7w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Mon, 13 Nov 2023 15:38:53 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Nicola Vetrini From: Jan Beulich Subject: [PATCH] x86/boot: tidy #include-s X-ClientProxiedBy: FR3P281CA0068.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::15) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|PR3PR04MB7484:EE_ X-MS-Office365-Filtering-Correlation-Id: e05956b0-c97d-4ad1-bced-08dbe4564343 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NdlLEtdDpEu8o2D8COE1Y+/BxGUjsDw4CU2UGdD9TrBWp3/vYJDySYHB0OFkcrwG05fOfHFEnqbvRHqQ+rJzHV4OJo2C+BusQ+GpTFRjnEVSp/KxUPMu9m/W2nOmqq+DBHOi7+kDKf27cEll0kC7OUmUh0SXG3WkNNfKaqienGD2Vie+DtL1wEfxFyE69WUvrW6OBnAtqAMcFpaUE7gBIFueNzuVzgetDZFg7azW5DqcC1fTUg2wGbqD71ebCsG6oQ82EPyL3TepKjkSGWi+AR1yjUusWZuJsvQIRQl94PvoWqnnZU5yHrFYbvOAEWZiBf+iowji0u2nC+pyAFiMO8kZW+Kx+8jOv3tobvZb0bOu+Ynb3pEKHMY1iJ6Aqu5B/021ymXI/Jfeo4fX7p2oYlDgdvJsIdlxcC6Czo9TgFHHhyKct+//dCxDf1uv/OsjohRyad0zJJHouFia6gNursPNkiP4ljgCGv16CrR1n+R+28WlnsAN/PZ385WwHSyxq8Dj2u1Zq/cPNzEs9Vdkzedb1uJvLm2ncPyuMoJR5fI2b3u8RJomRaAxs43ivrNwfwNI7gW1mh74bB/E0crZ9g76c90zgvsAFXf9e1mq3qRn6Umfb+J70mmCdTxuGcPn8ZwFP11gtHN/d//gxexi/Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(39860400002)(346002)(366004)(136003)(376002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(6506007)(2616005)(6512007)(6486002)(478600001)(26005)(4744005)(5660300002)(41300700001)(66556008)(2906002)(66476007)(6916009)(66946007)(54906003)(4326008)(8676002)(8936002)(316002)(36756003)(38100700002)(86362001)(31696002)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?u4qGu1v0T3hgE/Zx9SaRm3yTUVWR?= =?utf-8?q?J753yF+iSBAWrcouWjXLsVE9HkaJ6WrwE3OxuTVi4+75oO98Y837WU2m1FTcnLhUo?= =?utf-8?q?novmZDH0RHs/arcfdWw2R5aYllz7nuTPjJRxDAQU5Md5q/HOXG2chI7d1eECyHtoS?= =?utf-8?q?9A1bUa0jHjOs4w5TS9H4X4m4uztoiXvcxHEiwSbbi/WRn8sT+waVILUw0cGYFBqjB?= =?utf-8?q?SlPCsRQ514dGT+94+mEAQ6wq5FpNc1oB30gP7jZKyMHZJNMTVrI7Rrtatbw1e4t6o?= =?utf-8?q?mS+PnP+soqZLiOk26ZGoltp+cs43y4xX6J1egEs899qB+lT0hBTJN/l6IDmtKpL1+?= =?utf-8?q?pAdVwsReobdofuOrPVOXi5n9ThTNn9TaS705y8mxx5sQ4KAqKHJj/j8DmhyV0OqSY?= =?utf-8?q?F4KKtqpA8qylyzVPCU5j4OjDXAxn0eG8YccmYAOOEI8x9x0kByV3L63XMPqelyGCY?= =?utf-8?q?MMTKi7KE8Xp755OruWXnX643huq5GXam42QtOAEKmHFJPGDJkf/xZsqSEg9bM5Dj4?= =?utf-8?q?zNCoTbGMAo00w//h7QNaE92SOZw/UnlLBzSnh1fqLXU/aO8v8wAGV2FVjnJXSkbMy?= =?utf-8?q?3c5us/uXn2XtFHE3Scef21HX0WWEUBZSbuv8dzWWabgvS0UgVtHhPkWObjc8Yf2ks?= =?utf-8?q?gyxAvLhkwUkysuSxwKK83tzIiSVwIgUBXIcZD9qgnFoukouR8fVE4zWojeYgc4Vr4?= =?utf-8?q?RZ/4aA5RLHmrt3s+MFjB29N6nS3+ZCWkEJxF6O3f8fsSLyrZKPpbq7tqzfFGktl+n?= =?utf-8?q?BZWpLd6QNUhyVSqa88jEIz5RccE0xcovbaMkOAZzNB3+y+2A4Fu3m0fUSZjlbXEmp?= =?utf-8?q?yOItmn5EScNalMUp8z0/dNUlvjnw7GEk6oRenH8YDeVWchwPPNpkIrJ1ehUvCUSKs?= =?utf-8?q?AvCN+0LtAVSEuet2/CBhNNLOOGB+p9EVwiETwi2bekbV9VJojTWg4W6xPk4Bt+1nX?= =?utf-8?q?HElDxLBn53vzK03qs+Vt78lq2b/8YF78lUaTYmVuG7aRw6FVYZDQyRuod9/9u/ZN3?= =?utf-8?q?IrNJeKN3QymzE2OTWmUYCrREddID9pEAG8ZECJ3jc64TRPVC24K9twRhD23IxcShE?= =?utf-8?q?XYpX4eHSQ7aUE1J4yRHt1irk9mzU3+aRULh7lQmKBUM/3O6pRAAjWE/xH0qVh/WlE?= =?utf-8?q?4iFy2K7BwIUKhHrIFkmEy/FmNC8jcPw+7j7AqK6Ry+NvulyrTp0bRsserELGqIrZQ?= =?utf-8?q?v2fDlG1GcqBuTdSaPvSmZABLHB49WWqy3YIOlyNyVwcihQpgoOv1HT3IGgu7rSQIs?= =?utf-8?q?CSAzPFfvPG/y8UcinnHs1Iz1aOJ/MFg2RGFqSrqiU/4iZZd/h62zUQDRsYE2Gc327?= =?utf-8?q?imvLdLNW91F53FojwEN+Ke03NBCsulicwZFyY2CPY2YqhRc7mFC61rd9Riyz9m05h?= =?utf-8?q?N9gzA2gw5xw5Xwplkghs/hfn2ZA/jCpo8TCYkJD3S6wbQNUJLYyFE2XgC9IUgh6C+?= =?utf-8?q?gbGUbLizJRMxG88X+v4k9anoXTiUndn4GXKbhFYrl+6pKOyw/8z7nv7pW7M/sr3+k?= =?utf-8?q?tHC2URM6NIt4?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e05956b0-c97d-4ad1-bced-08dbe4564343 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2023 14:38:55.0891 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ragz8Dms5AFpSQlrBYYTiDXG86RBhKeLROkcEx2cUjVXDPfSeWmCPFUjxkTfWcajdkrObowmwNEBDo+OU0pgEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7484 As of d58a509e01c4 ("build,x86: remove the need for build32.mk") we don't need to use non-standard #include forms anymore in the sources for the boot code helper blobs. The only place where this kind of #include needs to remain (for the time being) is mkelf32.c. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/arch/x86/boot/defs.h +++ b/xen/arch/x86/boot/defs.h @@ -20,7 +20,7 @@ #ifndef __BOOT_DEFS_H__ #define __BOOT_DEFS_H__ -#include "../../../include/xen/stdbool.h" +#include #define __maybe_unused __attribute__((__unused__)) #define __packed __attribute__((__packed__)) --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -27,10 +27,11 @@ asm ( ); #include "defs.h" -#include "../../../include/xen/multiboot.h" -#include "../../../include/xen/multiboot2.h" -#include "../../../include/xen/kconfig.h" +#include +#include +#include + #include #ifdef CONFIG_VIDEO