From 00d0274dbad89e3ee53ed01530b211f1a785bfcf Mon Sep 17 00:00:00 2001 From: Simon Kuenzer Date: Tue, 17 Sep 2024 14:18:39 +0200 Subject: [PATCH] drivers/xenheaders: Move public Xen headers to own library This commit moves the official public Xen API headers to a separate library. These headers are originally copy from the Xen source tree and define the API to the hypervisor and virtual devices. This is done to better organize Xen-related code and to have single place for updates and dependency resolutions. The created library is kept invisible because it is only needed by Xen drivers and it is itself not a driver (reduce confusion). Signed-off-by: Simon Kuenzer Reviewed-by: Oleksii Moisieiev Reviewed-by: Oleksii Moisieiev Reviewed-by: Michalis Pappas Approved-by: Michalis Pappas GitHub-Closes: #1501 --- drivers/xen/9p/Config.uk | 1 + drivers/xen/Makefile.uk | 1 + drivers/xen/blk/Config.uk | 1 + drivers/xen/console/Config.uk | 1 + drivers/xen/emg_console/Config.uk | 1 + drivers/xen/net/Config.uk | 1 + drivers/xen/xenbus/Config.uk | 1 + drivers/xen/xenheaders/Config.uk | 4 ++++ drivers/xen/xenheaders/Makefile.uk | 10 ++++++++++ .../xen => drivers/xen/xenheaders}/include/xen/COPYING | 0 .../xen/xenheaders}/include/xen/arch-arm.h | 0 .../xen/xenheaders}/include/xen/arch-arm/hvm/save.h | 0 .../xen/xenheaders}/include/xen/arch-arm/smccc.h | 0 .../xenheaders}/include/xen/arch-x86/cpufeatureset.h | 0 .../xen/xenheaders}/include/xen/arch-x86/cpuid.h | 0 .../xen/xenheaders}/include/xen/arch-x86/hvm/save.h | 0 .../xenheaders}/include/xen/arch-x86/hvm/start_info.h | 0 .../xen/xenheaders}/include/xen/arch-x86/pmu.h | 0 .../xen/xenheaders}/include/xen/arch-x86/xen-mca.h | 0 .../xen/xenheaders}/include/xen/arch-x86/xen-x86_32.h | 0 .../xen/xenheaders}/include/xen/arch-x86/xen-x86_64.h | 0 .../xen/xenheaders}/include/xen/arch-x86/xen.h | 0 .../xen/xenheaders}/include/xen/arch-x86_32.h | 0 .../xen/xenheaders}/include/xen/arch-x86_64.h | 0 .../xen/xenheaders}/include/xen/callback.h | 0 .../xen/xenheaders}/include/xen/dom0_ops.h | 0 .../xen/xenheaders}/include/xen/domctl.h | 0 .../xen/xenheaders}/include/xen/elfnote.h | 0 .../xen => drivers/xen/xenheaders}/include/xen/errno.h | 0 .../xen/xenheaders}/include/xen/event_channel.h | 0 .../xen/xenheaders}/include/xen/features.h | 0 .../xen/xenheaders}/include/xen/grant_table.h | 0 .../xen/xenheaders}/include/xen/hvm/dm_op.h | 0 .../xen/xenheaders}/include/xen/hvm/e820.h | 0 .../xen/xenheaders}/include/xen/hvm/hvm_info_table.h | 0 .../xen/xenheaders}/include/xen/hvm/hvm_op.h | 0 .../xen/xenheaders}/include/xen/hvm/hvm_vcpu.h | 0 .../xen/xenheaders}/include/xen/hvm/hvm_xs_strings.h | 0 .../xen/xenheaders}/include/xen/hvm/ioreq.h | 0 .../xen/xenheaders}/include/xen/hvm/params.h | 0 .../xen/xenheaders}/include/xen/hvm/pvdrivers.h | 0 .../xen/xenheaders}/include/xen/hvm/save.h | 0 .../xen/xenheaders}/include/xen/io/9pfs.h | 0 .../xen/xenheaders}/include/xen/io/blkif.h | 0 .../xen/xenheaders}/include/xen/io/console.h | 0 .../xen/xenheaders}/include/xen/io/displif.h | 0 .../xen/xenheaders}/include/xen/io/fbif.h | 0 .../xen/xenheaders}/include/xen/io/fsif.h | 0 .../xen/xenheaders}/include/xen/io/kbdif.h | 0 .../xen/xenheaders}/include/xen/io/libxenvchan.h | 0 .../xen/xenheaders}/include/xen/io/netif.h | 0 .../xen/xenheaders}/include/xen/io/pciif.h | 0 .../xen/xenheaders}/include/xen/io/protocols.h | 0 .../xen/xenheaders}/include/xen/io/pvcalls.h | 0 .../xen/xenheaders}/include/xen/io/ring.h | 0 .../xen/xenheaders}/include/xen/io/sndif.h | 0 .../xen/xenheaders}/include/xen/io/tpmif.h | 0 .../xen/xenheaders}/include/xen/io/usbif.h | 0 .../xen/xenheaders}/include/xen/io/vscsiif.h | 0 .../xen/xenheaders}/include/xen/io/xenbus.h | 0 .../xen/xenheaders}/include/xen/io/xs_wire.h | 0 .../xen => drivers/xen/xenheaders}/include/xen/kexec.h | 0 .../xen/xenheaders}/include/xen/memory.h | 0 {plat/xen => drivers/xen/xenheaders}/include/xen/nmi.h | 0 .../xen/xenheaders}/include/xen/physdev.h | 0 .../xen/xenheaders}/include/xen/platform.h | 0 {plat/xen => drivers/xen/xenheaders}/include/xen/pmu.h | 0 .../xen => drivers/xen/xenheaders}/include/xen/sched.h | 0 .../xen/xenheaders}/include/xen/sysctl.h | 0 .../xen => drivers/xen/xenheaders}/include/xen/tmem.h | 0 .../xen => drivers/xen/xenheaders}/include/xen/trace.h | 0 .../xen => drivers/xen/xenheaders}/include/xen/vcpu.h | 0 .../xen/xenheaders}/include/xen/version.h | 0 .../xen/xenheaders}/include/xen/vm_event.h | 0 .../xen/xenheaders}/include/xen/xen-compat.h | 0 {plat/xen => drivers/xen/xenheaders}/include/xen/xen.h | 0 .../xen/xenheaders}/include/xen/xencomm.h | 0 .../xen/xenheaders}/include/xen/xenoprof.h | 0 .../xen/xenheaders}/include/xen/xsm/flask_op.h | 0 plat/xen/Config.uk | 1 + 80 files changed, 22 insertions(+) create mode 100644 drivers/xen/xenheaders/Config.uk create mode 100644 drivers/xen/xenheaders/Makefile.uk rename {plat/xen => drivers/xen/xenheaders}/include/xen/COPYING (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-arm.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-arm/hvm/save.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-arm/smccc.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/cpufeatureset.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/cpuid.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/hvm/save.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/hvm/start_info.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/pmu.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/xen-mca.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/xen-x86_32.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/xen-x86_64.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86/xen.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86_32.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/arch-x86_64.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/callback.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/dom0_ops.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/domctl.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/elfnote.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/errno.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/event_channel.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/features.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/grant_table.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/dm_op.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/e820.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/hvm_info_table.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/hvm_op.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/hvm_vcpu.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/hvm_xs_strings.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/ioreq.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/params.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/pvdrivers.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/hvm/save.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/9pfs.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/blkif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/console.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/displif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/fbif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/fsif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/kbdif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/libxenvchan.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/netif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/pciif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/protocols.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/pvcalls.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/ring.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/sndif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/tpmif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/usbif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/vscsiif.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/xenbus.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/io/xs_wire.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/kexec.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/memory.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/nmi.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/physdev.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/platform.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/pmu.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/sched.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/sysctl.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/tmem.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/trace.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/vcpu.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/version.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/vm_event.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/xen-compat.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/xen.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/xencomm.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/xenoprof.h (100%) rename {plat/xen => drivers/xen/xenheaders}/include/xen/xsm/flask_op.h (100%) diff --git a/drivers/xen/9p/Config.uk b/drivers/xen/9p/Config.uk index 3b5678572..936de46c4 100644 --- a/drivers/xen/9p/Config.uk +++ b/drivers/xen/9p/Config.uk @@ -1,6 +1,7 @@ menuconfig LIBXEN_9PFRONT bool "Xenbus 9pfront Driver" select LIBXEN_XENBUS + select LIBXENHEADERS depends on PLAT_XEN depends on LIBUK9P help diff --git a/drivers/xen/Makefile.uk b/drivers/xen/Makefile.uk index 2870dd168..81540bdcd 100644 --- a/drivers/xen/Makefile.uk +++ b/drivers/xen/Makefile.uk @@ -6,6 +6,7 @@ UK_DRIV_XEN_BASE := $(UK_DRIV_BASE)/xen +$(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/xenheaders)) $(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/9p)) $(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/blk)) $(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/net)) diff --git a/drivers/xen/blk/Config.uk b/drivers/xen/blk/Config.uk index b27e5c4df..7fd318c0d 100644 --- a/drivers/xen/blk/Config.uk +++ b/drivers/xen/blk/Config.uk @@ -1,6 +1,7 @@ menuconfig LIBXEN_BLKFRONT bool "Xenbus Blkfront Driver" select LIBXEN_XENBUS + select LIBXENHEADERS depends on PLAT_XEN depends on LIBUKBLKDEV help diff --git a/drivers/xen/console/Config.uk b/drivers/xen/console/Config.uk index dd6f4a414..b115170ae 100644 --- a/drivers/xen/console/Config.uk +++ b/drivers/xen/console/Config.uk @@ -1,5 +1,6 @@ menuconfig LIBXEN_CONSOLE bool "Hypervisor console" + select LIBXENHEADERS select LIBUKCONSOLE select LIBNOLIBC if !HAVE_LIBC depends on PLAT_XEN diff --git a/drivers/xen/emg_console/Config.uk b/drivers/xen/emg_console/Config.uk index 3905d7fbd..c21f729ca 100644 --- a/drivers/xen/emg_console/Config.uk +++ b/drivers/xen/emg_console/Config.uk @@ -1,5 +1,6 @@ menuconfig LIBXEN_EMG_CONSOLE bool "Emergency console" + select LIBXENHEADERS select LIBUKCONSOLE depends on PLAT_XEN help diff --git a/drivers/xen/net/Config.uk b/drivers/xen/net/Config.uk index e7e8b69dc..cc8c8d366 100644 --- a/drivers/xen/net/Config.uk +++ b/drivers/xen/net/Config.uk @@ -1,6 +1,7 @@ config LIBXEN_NETFRONT bool "Xenbus Netfront Driver" select LIBXEN_XENBUS + select LIBXENHEADERS depends on XEN_GNTTAB depends on PLAT_XEN depends on LIBUKNETDEV diff --git a/drivers/xen/xenbus/Config.uk b/drivers/xen/xenbus/Config.uk index 694797c7f..43c9e4777 100644 --- a/drivers/xen/xenbus/Config.uk +++ b/drivers/xen/xenbus/Config.uk @@ -2,6 +2,7 @@ config LIBXEN_XENBUS bool "Xenbus/XenStore driver" default y if XEN_PV depends on PLAT_XEN + select LIBXENHEADERS select LIBUKALLOC select LIBUKSCHED select LIBUKBUS diff --git a/drivers/xen/xenheaders/Config.uk b/drivers/xen/xenheaders/Config.uk new file mode 100644 index 000000000..785cddbde --- /dev/null +++ b/drivers/xen/xenheaders/Config.uk @@ -0,0 +1,4 @@ +config LIBXENHEADERS + # Invisible support headers library for Xen drivers + bool + select LIBNOLIBC if !HAVE_LIBC diff --git a/drivers/xen/xenheaders/Makefile.uk b/drivers/xen/xenheaders/Makefile.uk new file mode 100644 index 000000000..d72d12b5e --- /dev/null +++ b/drivers/xen/xenheaders/Makefile.uk @@ -0,0 +1,10 @@ +# NOTE: The headers expect that at least the compile flag +# __XEN_INTERFACE_VERSION__ is configured. Additionally, +# the following options influence the compiled Xen interface: +# - XEN_HAVE_PV_GUEST_ENTRY +# - XEN_HAVE_PV_UPCALL_MASK +# These settings should be globally set and depend on the +# target image type and CPU architecture (e.g., PV/x86, PVH/Arm). + +ASINCLUDES-$(CONFIG_LIBXENHEADERS) += -I$(IMPORT_BASE)/include +CINCLUDES-$(CONFIG_LIBXENHEADERS) += -I$(IMPORT_BASE)/include diff --git a/plat/xen/include/xen/COPYING b/drivers/xen/xenheaders/include/xen/COPYING similarity index 100% rename from plat/xen/include/xen/COPYING rename to drivers/xen/xenheaders/include/xen/COPYING diff --git a/plat/xen/include/xen/arch-arm.h b/drivers/xen/xenheaders/include/xen/arch-arm.h similarity index 100% rename from plat/xen/include/xen/arch-arm.h rename to drivers/xen/xenheaders/include/xen/arch-arm.h diff --git a/plat/xen/include/xen/arch-arm/hvm/save.h b/drivers/xen/xenheaders/include/xen/arch-arm/hvm/save.h similarity index 100% rename from plat/xen/include/xen/arch-arm/hvm/save.h rename to drivers/xen/xenheaders/include/xen/arch-arm/hvm/save.h diff --git a/plat/xen/include/xen/arch-arm/smccc.h b/drivers/xen/xenheaders/include/xen/arch-arm/smccc.h similarity index 100% rename from plat/xen/include/xen/arch-arm/smccc.h rename to drivers/xen/xenheaders/include/xen/arch-arm/smccc.h diff --git a/plat/xen/include/xen/arch-x86/cpufeatureset.h b/drivers/xen/xenheaders/include/xen/arch-x86/cpufeatureset.h similarity index 100% rename from plat/xen/include/xen/arch-x86/cpufeatureset.h rename to drivers/xen/xenheaders/include/xen/arch-x86/cpufeatureset.h diff --git a/plat/xen/include/xen/arch-x86/cpuid.h b/drivers/xen/xenheaders/include/xen/arch-x86/cpuid.h similarity index 100% rename from plat/xen/include/xen/arch-x86/cpuid.h rename to drivers/xen/xenheaders/include/xen/arch-x86/cpuid.h diff --git a/plat/xen/include/xen/arch-x86/hvm/save.h b/drivers/xen/xenheaders/include/xen/arch-x86/hvm/save.h similarity index 100% rename from plat/xen/include/xen/arch-x86/hvm/save.h rename to drivers/xen/xenheaders/include/xen/arch-x86/hvm/save.h diff --git a/plat/xen/include/xen/arch-x86/hvm/start_info.h b/drivers/xen/xenheaders/include/xen/arch-x86/hvm/start_info.h similarity index 100% rename from plat/xen/include/xen/arch-x86/hvm/start_info.h rename to drivers/xen/xenheaders/include/xen/arch-x86/hvm/start_info.h diff --git a/plat/xen/include/xen/arch-x86/pmu.h b/drivers/xen/xenheaders/include/xen/arch-x86/pmu.h similarity index 100% rename from plat/xen/include/xen/arch-x86/pmu.h rename to drivers/xen/xenheaders/include/xen/arch-x86/pmu.h diff --git a/plat/xen/include/xen/arch-x86/xen-mca.h b/drivers/xen/xenheaders/include/xen/arch-x86/xen-mca.h similarity index 100% rename from plat/xen/include/xen/arch-x86/xen-mca.h rename to drivers/xen/xenheaders/include/xen/arch-x86/xen-mca.h diff --git a/plat/xen/include/xen/arch-x86/xen-x86_32.h b/drivers/xen/xenheaders/include/xen/arch-x86/xen-x86_32.h similarity index 100% rename from plat/xen/include/xen/arch-x86/xen-x86_32.h rename to drivers/xen/xenheaders/include/xen/arch-x86/xen-x86_32.h diff --git a/plat/xen/include/xen/arch-x86/xen-x86_64.h b/drivers/xen/xenheaders/include/xen/arch-x86/xen-x86_64.h similarity index 100% rename from plat/xen/include/xen/arch-x86/xen-x86_64.h rename to drivers/xen/xenheaders/include/xen/arch-x86/xen-x86_64.h diff --git a/plat/xen/include/xen/arch-x86/xen.h b/drivers/xen/xenheaders/include/xen/arch-x86/xen.h similarity index 100% rename from plat/xen/include/xen/arch-x86/xen.h rename to drivers/xen/xenheaders/include/xen/arch-x86/xen.h diff --git a/plat/xen/include/xen/arch-x86_32.h b/drivers/xen/xenheaders/include/xen/arch-x86_32.h similarity index 100% rename from plat/xen/include/xen/arch-x86_32.h rename to drivers/xen/xenheaders/include/xen/arch-x86_32.h diff --git a/plat/xen/include/xen/arch-x86_64.h b/drivers/xen/xenheaders/include/xen/arch-x86_64.h similarity index 100% rename from plat/xen/include/xen/arch-x86_64.h rename to drivers/xen/xenheaders/include/xen/arch-x86_64.h diff --git a/plat/xen/include/xen/callback.h b/drivers/xen/xenheaders/include/xen/callback.h similarity index 100% rename from plat/xen/include/xen/callback.h rename to drivers/xen/xenheaders/include/xen/callback.h diff --git a/plat/xen/include/xen/dom0_ops.h b/drivers/xen/xenheaders/include/xen/dom0_ops.h similarity index 100% rename from plat/xen/include/xen/dom0_ops.h rename to drivers/xen/xenheaders/include/xen/dom0_ops.h diff --git a/plat/xen/include/xen/domctl.h b/drivers/xen/xenheaders/include/xen/domctl.h similarity index 100% rename from plat/xen/include/xen/domctl.h rename to drivers/xen/xenheaders/include/xen/domctl.h diff --git a/plat/xen/include/xen/elfnote.h b/drivers/xen/xenheaders/include/xen/elfnote.h similarity index 100% rename from plat/xen/include/xen/elfnote.h rename to drivers/xen/xenheaders/include/xen/elfnote.h diff --git a/plat/xen/include/xen/errno.h b/drivers/xen/xenheaders/include/xen/errno.h similarity index 100% rename from plat/xen/include/xen/errno.h rename to drivers/xen/xenheaders/include/xen/errno.h diff --git a/plat/xen/include/xen/event_channel.h b/drivers/xen/xenheaders/include/xen/event_channel.h similarity index 100% rename from plat/xen/include/xen/event_channel.h rename to drivers/xen/xenheaders/include/xen/event_channel.h diff --git a/plat/xen/include/xen/features.h b/drivers/xen/xenheaders/include/xen/features.h similarity index 100% rename from plat/xen/include/xen/features.h rename to drivers/xen/xenheaders/include/xen/features.h diff --git a/plat/xen/include/xen/grant_table.h b/drivers/xen/xenheaders/include/xen/grant_table.h similarity index 100% rename from plat/xen/include/xen/grant_table.h rename to drivers/xen/xenheaders/include/xen/grant_table.h diff --git a/plat/xen/include/xen/hvm/dm_op.h b/drivers/xen/xenheaders/include/xen/hvm/dm_op.h similarity index 100% rename from plat/xen/include/xen/hvm/dm_op.h rename to drivers/xen/xenheaders/include/xen/hvm/dm_op.h diff --git a/plat/xen/include/xen/hvm/e820.h b/drivers/xen/xenheaders/include/xen/hvm/e820.h similarity index 100% rename from plat/xen/include/xen/hvm/e820.h rename to drivers/xen/xenheaders/include/xen/hvm/e820.h diff --git a/plat/xen/include/xen/hvm/hvm_info_table.h b/drivers/xen/xenheaders/include/xen/hvm/hvm_info_table.h similarity index 100% rename from plat/xen/include/xen/hvm/hvm_info_table.h rename to drivers/xen/xenheaders/include/xen/hvm/hvm_info_table.h diff --git a/plat/xen/include/xen/hvm/hvm_op.h b/drivers/xen/xenheaders/include/xen/hvm/hvm_op.h similarity index 100% rename from plat/xen/include/xen/hvm/hvm_op.h rename to drivers/xen/xenheaders/include/xen/hvm/hvm_op.h diff --git a/plat/xen/include/xen/hvm/hvm_vcpu.h b/drivers/xen/xenheaders/include/xen/hvm/hvm_vcpu.h similarity index 100% rename from plat/xen/include/xen/hvm/hvm_vcpu.h rename to drivers/xen/xenheaders/include/xen/hvm/hvm_vcpu.h diff --git a/plat/xen/include/xen/hvm/hvm_xs_strings.h b/drivers/xen/xenheaders/include/xen/hvm/hvm_xs_strings.h similarity index 100% rename from plat/xen/include/xen/hvm/hvm_xs_strings.h rename to drivers/xen/xenheaders/include/xen/hvm/hvm_xs_strings.h diff --git a/plat/xen/include/xen/hvm/ioreq.h b/drivers/xen/xenheaders/include/xen/hvm/ioreq.h similarity index 100% rename from plat/xen/include/xen/hvm/ioreq.h rename to drivers/xen/xenheaders/include/xen/hvm/ioreq.h diff --git a/plat/xen/include/xen/hvm/params.h b/drivers/xen/xenheaders/include/xen/hvm/params.h similarity index 100% rename from plat/xen/include/xen/hvm/params.h rename to drivers/xen/xenheaders/include/xen/hvm/params.h diff --git a/plat/xen/include/xen/hvm/pvdrivers.h b/drivers/xen/xenheaders/include/xen/hvm/pvdrivers.h similarity index 100% rename from plat/xen/include/xen/hvm/pvdrivers.h rename to drivers/xen/xenheaders/include/xen/hvm/pvdrivers.h diff --git a/plat/xen/include/xen/hvm/save.h b/drivers/xen/xenheaders/include/xen/hvm/save.h similarity index 100% rename from plat/xen/include/xen/hvm/save.h rename to drivers/xen/xenheaders/include/xen/hvm/save.h diff --git a/plat/xen/include/xen/io/9pfs.h b/drivers/xen/xenheaders/include/xen/io/9pfs.h similarity index 100% rename from plat/xen/include/xen/io/9pfs.h rename to drivers/xen/xenheaders/include/xen/io/9pfs.h diff --git a/plat/xen/include/xen/io/blkif.h b/drivers/xen/xenheaders/include/xen/io/blkif.h similarity index 100% rename from plat/xen/include/xen/io/blkif.h rename to drivers/xen/xenheaders/include/xen/io/blkif.h diff --git a/plat/xen/include/xen/io/console.h b/drivers/xen/xenheaders/include/xen/io/console.h similarity index 100% rename from plat/xen/include/xen/io/console.h rename to drivers/xen/xenheaders/include/xen/io/console.h diff --git a/plat/xen/include/xen/io/displif.h b/drivers/xen/xenheaders/include/xen/io/displif.h similarity index 100% rename from plat/xen/include/xen/io/displif.h rename to drivers/xen/xenheaders/include/xen/io/displif.h diff --git a/plat/xen/include/xen/io/fbif.h b/drivers/xen/xenheaders/include/xen/io/fbif.h similarity index 100% rename from plat/xen/include/xen/io/fbif.h rename to drivers/xen/xenheaders/include/xen/io/fbif.h diff --git a/plat/xen/include/xen/io/fsif.h b/drivers/xen/xenheaders/include/xen/io/fsif.h similarity index 100% rename from plat/xen/include/xen/io/fsif.h rename to drivers/xen/xenheaders/include/xen/io/fsif.h diff --git a/plat/xen/include/xen/io/kbdif.h b/drivers/xen/xenheaders/include/xen/io/kbdif.h similarity index 100% rename from plat/xen/include/xen/io/kbdif.h rename to drivers/xen/xenheaders/include/xen/io/kbdif.h diff --git a/plat/xen/include/xen/io/libxenvchan.h b/drivers/xen/xenheaders/include/xen/io/libxenvchan.h similarity index 100% rename from plat/xen/include/xen/io/libxenvchan.h rename to drivers/xen/xenheaders/include/xen/io/libxenvchan.h diff --git a/plat/xen/include/xen/io/netif.h b/drivers/xen/xenheaders/include/xen/io/netif.h similarity index 100% rename from plat/xen/include/xen/io/netif.h rename to drivers/xen/xenheaders/include/xen/io/netif.h diff --git a/plat/xen/include/xen/io/pciif.h b/drivers/xen/xenheaders/include/xen/io/pciif.h similarity index 100% rename from plat/xen/include/xen/io/pciif.h rename to drivers/xen/xenheaders/include/xen/io/pciif.h diff --git a/plat/xen/include/xen/io/protocols.h b/drivers/xen/xenheaders/include/xen/io/protocols.h similarity index 100% rename from plat/xen/include/xen/io/protocols.h rename to drivers/xen/xenheaders/include/xen/io/protocols.h diff --git a/plat/xen/include/xen/io/pvcalls.h b/drivers/xen/xenheaders/include/xen/io/pvcalls.h similarity index 100% rename from plat/xen/include/xen/io/pvcalls.h rename to drivers/xen/xenheaders/include/xen/io/pvcalls.h diff --git a/plat/xen/include/xen/io/ring.h b/drivers/xen/xenheaders/include/xen/io/ring.h similarity index 100% rename from plat/xen/include/xen/io/ring.h rename to drivers/xen/xenheaders/include/xen/io/ring.h diff --git a/plat/xen/include/xen/io/sndif.h b/drivers/xen/xenheaders/include/xen/io/sndif.h similarity index 100% rename from plat/xen/include/xen/io/sndif.h rename to drivers/xen/xenheaders/include/xen/io/sndif.h diff --git a/plat/xen/include/xen/io/tpmif.h b/drivers/xen/xenheaders/include/xen/io/tpmif.h similarity index 100% rename from plat/xen/include/xen/io/tpmif.h rename to drivers/xen/xenheaders/include/xen/io/tpmif.h diff --git a/plat/xen/include/xen/io/usbif.h b/drivers/xen/xenheaders/include/xen/io/usbif.h similarity index 100% rename from plat/xen/include/xen/io/usbif.h rename to drivers/xen/xenheaders/include/xen/io/usbif.h diff --git a/plat/xen/include/xen/io/vscsiif.h b/drivers/xen/xenheaders/include/xen/io/vscsiif.h similarity index 100% rename from plat/xen/include/xen/io/vscsiif.h rename to drivers/xen/xenheaders/include/xen/io/vscsiif.h diff --git a/plat/xen/include/xen/io/xenbus.h b/drivers/xen/xenheaders/include/xen/io/xenbus.h similarity index 100% rename from plat/xen/include/xen/io/xenbus.h rename to drivers/xen/xenheaders/include/xen/io/xenbus.h diff --git a/plat/xen/include/xen/io/xs_wire.h b/drivers/xen/xenheaders/include/xen/io/xs_wire.h similarity index 100% rename from plat/xen/include/xen/io/xs_wire.h rename to drivers/xen/xenheaders/include/xen/io/xs_wire.h diff --git a/plat/xen/include/xen/kexec.h b/drivers/xen/xenheaders/include/xen/kexec.h similarity index 100% rename from plat/xen/include/xen/kexec.h rename to drivers/xen/xenheaders/include/xen/kexec.h diff --git a/plat/xen/include/xen/memory.h b/drivers/xen/xenheaders/include/xen/memory.h similarity index 100% rename from plat/xen/include/xen/memory.h rename to drivers/xen/xenheaders/include/xen/memory.h diff --git a/plat/xen/include/xen/nmi.h b/drivers/xen/xenheaders/include/xen/nmi.h similarity index 100% rename from plat/xen/include/xen/nmi.h rename to drivers/xen/xenheaders/include/xen/nmi.h diff --git a/plat/xen/include/xen/physdev.h b/drivers/xen/xenheaders/include/xen/physdev.h similarity index 100% rename from plat/xen/include/xen/physdev.h rename to drivers/xen/xenheaders/include/xen/physdev.h diff --git a/plat/xen/include/xen/platform.h b/drivers/xen/xenheaders/include/xen/platform.h similarity index 100% rename from plat/xen/include/xen/platform.h rename to drivers/xen/xenheaders/include/xen/platform.h diff --git a/plat/xen/include/xen/pmu.h b/drivers/xen/xenheaders/include/xen/pmu.h similarity index 100% rename from plat/xen/include/xen/pmu.h rename to drivers/xen/xenheaders/include/xen/pmu.h diff --git a/plat/xen/include/xen/sched.h b/drivers/xen/xenheaders/include/xen/sched.h similarity index 100% rename from plat/xen/include/xen/sched.h rename to drivers/xen/xenheaders/include/xen/sched.h diff --git a/plat/xen/include/xen/sysctl.h b/drivers/xen/xenheaders/include/xen/sysctl.h similarity index 100% rename from plat/xen/include/xen/sysctl.h rename to drivers/xen/xenheaders/include/xen/sysctl.h diff --git a/plat/xen/include/xen/tmem.h b/drivers/xen/xenheaders/include/xen/tmem.h similarity index 100% rename from plat/xen/include/xen/tmem.h rename to drivers/xen/xenheaders/include/xen/tmem.h diff --git a/plat/xen/include/xen/trace.h b/drivers/xen/xenheaders/include/xen/trace.h similarity index 100% rename from plat/xen/include/xen/trace.h rename to drivers/xen/xenheaders/include/xen/trace.h diff --git a/plat/xen/include/xen/vcpu.h b/drivers/xen/xenheaders/include/xen/vcpu.h similarity index 100% rename from plat/xen/include/xen/vcpu.h rename to drivers/xen/xenheaders/include/xen/vcpu.h diff --git a/plat/xen/include/xen/version.h b/drivers/xen/xenheaders/include/xen/version.h similarity index 100% rename from plat/xen/include/xen/version.h rename to drivers/xen/xenheaders/include/xen/version.h diff --git a/plat/xen/include/xen/vm_event.h b/drivers/xen/xenheaders/include/xen/vm_event.h similarity index 100% rename from plat/xen/include/xen/vm_event.h rename to drivers/xen/xenheaders/include/xen/vm_event.h diff --git a/plat/xen/include/xen/xen-compat.h b/drivers/xen/xenheaders/include/xen/xen-compat.h similarity index 100% rename from plat/xen/include/xen/xen-compat.h rename to drivers/xen/xenheaders/include/xen/xen-compat.h diff --git a/plat/xen/include/xen/xen.h b/drivers/xen/xenheaders/include/xen/xen.h similarity index 100% rename from plat/xen/include/xen/xen.h rename to drivers/xen/xenheaders/include/xen/xen.h diff --git a/plat/xen/include/xen/xencomm.h b/drivers/xen/xenheaders/include/xen/xencomm.h similarity index 100% rename from plat/xen/include/xen/xencomm.h rename to drivers/xen/xenheaders/include/xen/xencomm.h diff --git a/plat/xen/include/xen/xenoprof.h b/drivers/xen/xenheaders/include/xen/xenoprof.h similarity index 100% rename from plat/xen/include/xen/xenoprof.h rename to drivers/xen/xenheaders/include/xen/xenoprof.h diff --git a/plat/xen/include/xen/xsm/flask_op.h b/drivers/xen/xenheaders/include/xen/xsm/flask_op.h similarity index 100% rename from plat/xen/include/xen/xsm/flask_op.h rename to drivers/xen/xenheaders/include/xen/xsm/flask_op.h diff --git a/plat/xen/Config.uk b/plat/xen/Config.uk index 68f5c0ebc..19480c5b3 100644 --- a/plat/xen/Config.uk +++ b/plat/xen/Config.uk @@ -5,6 +5,7 @@ menuconfig PLAT_XEN depends on ((ARCH_X86_32 && !HAVE_SYSCALL) || (ARCH_X86_64 && !HAVE_SYSCALL) || (ARCH_ARM_32 && !HAVE_SYSCALL) || (ARCH_ARM_64 && !HAVE_SYSCALL)) depends on !HAVE_PAGING imply XEN_PV_BUILD_P2M + select LIBXENHEADERS select LIBUKDEBUG select LIBUKBOOT select LIBNOLIBC if !HAVE_LIBC -- 2.39.5