[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] x86/boot: tidy #include-s


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Mon, 13 Nov 2023 15:38:53 +0100
  • 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
  • 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-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==
  • Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>
  • Delivery-date: Mon, 13 Nov 2023 14:39:04 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

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 <jbeulich@xxxxxxxx>

--- 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 <xen/stdbool.h>
 
 #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 <xen/kconfig.h>
+#include <xen/multiboot.h>
+#include <xen/multiboot2.h>
+
 #include <public/arch-x86/hvm/start_info.h>
 
 #ifdef CONFIG_VIDEO



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.