| Message ID | 20210113123455.23209-3-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanup to tools/tests | expand |
Andrew Cooper writes ("[PATCH 2/3] tools: Move xen-access from tests/ to misc/"):
> xen-access is a tool for a human to use, rather than a test. Move it
> into misc/ as a more appropriate location to live.
>
> Move the -DXC_WANT_COMPAT_DEVICEMODEL_API from CFLAGS into xen-access.c itself
> to avoid adding Makefile complexity.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
On Wed, Jan 13, 2021 at 7:35 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote: > > xen-access is a tool for a human to use, rather than a test. Move it > into misc/ as a more appropriate location to live. > > Move the -DXC_WANT_COMPAT_DEVICEMODEL_API from CFLAGS into xen-access.c itself > to avoid adding Makefile complexity. Acked-by: Tamas K Lengyel <tamas@tklengyel.com>
On 13/01/2021 18:50, Tamas K Lengyel wrote: > On Wed, Jan 13, 2021 at 7:35 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote: >> xen-access is a tool for a human to use, rather than a test. Move it >> into misc/ as a more appropriate location to live. >> >> Move the -DXC_WANT_COMPAT_DEVICEMODEL_API from CFLAGS into xen-access.c itself >> to avoid adding Makefile complexity. > Acked-by: Tamas K Lengyel <tamas@tklengyel.com> Thanks. I'll also update the MAINTAINERs path, which I forgot to do. ~Andrew
diff --git a/.gitignore b/.gitignore index 1b54ea3111..630bdf5b99 100644 --- a/.gitignore +++ b/.gitignore @@ -272,7 +272,6 @@ tools/tests/x86_emulator/*sse*.[ch] tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] -tools/tests/xen-access/xen-access tools/tests/xenstore/xs-test tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj diff --git a/tools/misc/.gitignore b/tools/misc/.gitignore index c5fe2cfccd..e332ed4ec7 100644 --- a/tools/misc/.gitignore +++ b/tools/misc/.gitignore @@ -1 +1,2 @@ +xen-access xen-ucode diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 7d37f297a9..612b7002e5 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -30,6 +30,7 @@ INSTALL_SBIN += xenlockprof INSTALL_SBIN += xenperf INSTALL_SBIN += xenpm INSTALL_SBIN += xenwatchdogd +INSTALL_SBIN += xen-access INSTALL_SBIN += xen-livepatch INSTALL_SBIN += xen-diag INSTALL_SBIN += $(INSTALL_SBIN-y) @@ -73,6 +74,9 @@ clean: .PHONY: distclean distclean: clean +xen-access: xen-access.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenevtchn) $(APPEND_LDFLAGS) + xen-cpuid: xen-cpuid.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) diff --git a/tools/tests/xen-access/xen-access.c b/tools/misc/xen-access.c similarity index 99% rename from tools/tests/xen-access/xen-access.c rename to tools/misc/xen-access.c index 1ab4f6705f..4bbef0bd2e 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/misc/xen-access.c @@ -38,6 +38,7 @@ #include <sys/mman.h> #include <poll.h> +#define XC_WANT_COMPAT_DEVICEMODEL_API #include <xenctrl.h> #include <xenevtchn.h> #include <xen/vm_event.h> diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 9077fa14d3..771715be0f 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -8,7 +8,6 @@ SUBDIRS-y += mem-sharing ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif -SUBDIRS-y += xen-access SUBDIRS-y += xenstore SUBDIRS-y += depriv SUBDIRS-$(CONFIG_HAS_PCI) += vpci diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile deleted file mode 100644 index 131c9f375d..0000000000 --- a/tools/tests/xen-access/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -XEN_ROOT=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Werror -CFLAGS += -DXC_WANT_COMPAT_DEVICEMODEL_API - -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxenguest) -CFLAGS += $(CFLAGS_libxenevtchn) -CFLAGS += $(CFLAGS_xeninclude) - -TARGETS-y := xen-access -TARGETS := $(TARGETS-y) - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) - -.PHONY: clean -clean: - $(RM) *.o $(TARGETS) *~ $(DEPS_RM) - -.PHONY: distclean -distclean: clean - -xen-access: xen-access.o Makefile - $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenevtchn) - -install uninstall: - --include $(DEPS_INCLUDE)
xen-access is a tool for a human to use, rather than a test. Move it into misc/ as a more appropriate location to live. Move the -DXC_WANT_COMPAT_DEVICEMODEL_API from CFLAGS into xen-access.c itself to avoid adding Makefile complexity. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Ian Jackson <iwj@xenproject.org> CC: Tamas K Lengyel <tamas@tklengyel.com> --- .gitignore | 1 - tools/misc/.gitignore | 1 + tools/misc/Makefile | 4 ++++ tools/{tests/xen-access => misc}/xen-access.c | 1 + tools/tests/Makefile | 1 - tools/tests/xen-access/Makefile | 33 --------------------------- 6 files changed, 6 insertions(+), 35 deletions(-) rename tools/{tests/xen-access => misc}/xen-access.c (99%) delete mode 100644 tools/tests/xen-access/Makefile