[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 03/10] dom0less: Move asm-generic/dom0less-build.h -> xen/dom0less-build.h
It's meant to be usable by anyone with CONFIG_DOM0LESS_BOOT. While moving, replace an inclusion of public/domctl.h by a forward declaration. Signed-off-by: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx> --- xen/arch/arm/dom0less-build.c | 2 +- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/include/asm/Makefile | 1 - xen/arch/arm/setup.c | 2 +- xen/common/device-tree/dom0less-build.c | 2 +- xen/include/{asm-generic => xen}/dom0less-build.h | 7 +++---- 6 files changed, 7 insertions(+), 9 deletions(-) rename xen/include/{asm-generic => xen}/dom0less-build.h (96%) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 69b9ea22ce..286557fafd 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -3,6 +3,7 @@ #include <xen/domain_page.h> #include <xen/fdt-domain-build.h> #include <xen/fdt-kernel.h> +#include <xen/dom0less-build.h> #include <xen/err.h> #include <xen/event.h> #include <xen/grant_table.h> @@ -20,7 +21,6 @@ #include <public/io/xs_wire.h> #include <asm/arm64/sve.h> -#include <asm/dom0less-build.h> #include <asm/domain_build.h> #include <asm/grant_table.h> #include <asm/setup.h> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d91a71acfd..463ae4474d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2,6 +2,7 @@ #include <xen/init.h> #include <xen/bootinfo.h> #include <xen/compile.h> +#include <xen/dom0less-build.h> #include <xen/fdt-domain-build.h> #include <xen/fdt-kernel.h> #include <xen/lib.h> @@ -32,7 +33,6 @@ #include <asm/setup.h> #include <asm/arm64/sve.h> #include <asm/cpufeature.h> -#include <asm/dom0less-build.h> #include <asm/domain_build.h> #include <xen/event.h> diff --git a/xen/arch/arm/include/asm/Makefile b/xen/arch/arm/include/asm/Makefile index 87c8821421..4565baca6a 100644 --- a/xen/arch/arm/include/asm/Makefile +++ b/xen/arch/arm/include/asm/Makefile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only generic-y += altp2m.h generic-y += device.h -generic-y += dom0less-build.h generic-y += hardirq.h generic-y += iocap.h generic-y += irq-dt.h diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 8abc1d641d..27bd3f5a6e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -11,6 +11,7 @@ #include <xen/bootinfo.h> #include <xen/compile.h> #include <xen/device_tree.h> +#include <xen/dom0less-build.h> #include <xen/domain_page.h> #include <xen/grant_table.h> #include <xen/llc-coloring.h> @@ -39,7 +40,6 @@ #include <xen/warning.h> #include <xen/hypercall.h> #include <asm/alternative.h> -#include <asm/dom0less-build.h> #include <asm/page.h> #include <asm/current.h> #include <asm/setup.h> diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index efa846da2a..e49213e763 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -2,6 +2,7 @@ #include <xen/bootinfo.h> #include <xen/device_tree.h> +#include <xen/dom0less-build.h> #include <xen/domain.h> #include <xen/domain_page.h> #include <xen/err.h> @@ -25,7 +26,6 @@ #include <public/event_channel.h> #include <public/io/xs_wire.h> -#include <asm/dom0less-build.h> #include <asm/setup.h> #include <xen/static-memory.h> diff --git a/xen/include/asm-generic/dom0less-build.h b/xen/include/xen/dom0less-build.h similarity index 96% rename from xen/include/asm-generic/dom0less-build.h rename to xen/include/xen/dom0less-build.h index e0ad0429ec..34b9884cc7 100644 --- a/xen/include/asm-generic/dom0less-build.h +++ b/xen/include/xen/dom0less-build.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef __ASM_GENERIC_DOM0LESS_BUILD_H__ -#define __ASM_GENERIC_DOM0LESS_BUILD_H__ +#ifndef XEN_DOM0LESS_BUILD_H +#define XEN_DOM0LESS_BUILD_H #include <xen/stdbool.h> @@ -9,8 +9,7 @@ struct domain; #ifdef CONFIG_DOM0LESS_BOOT -#include <public/domctl.h> - +struct xen_domctl_createdomain; struct dt_device_node; struct kernel_info; -- 2.43.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |