| Message ID | 20210113123455.23209-4-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanup to tools/tests | expand |
Andrew Cooper writes ("[PATCH 3/3] tools: Move memshrtool from tests/ to misc/"):
> memshrtool is a tool for a human to use, rather than a test. Move it into
> misc/ as a more appropriate location to live. Also rename it to
> xen-memshare-tool
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
On 13/01/2021 13:01, Ian Jackson wrote: > Andrew Cooper writes ("[PATCH 3/3] tools: Move memshrtool from tests/ to misc/"): >> memshrtool is a tool for a human to use, rather than a test. Move it into >> misc/ as a more appropriate location to live. Also rename it to >> xen-memshare-tool > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Thanks, but I expect that Gitlab will tell me that I broke the ARM build, by losing a "only build this for x86"-ism. I've folded this delta in to resolve: diff --git a/tools/misc/Makefile b/tools/misc/Makefile index fbe010a55a..1774ff014f 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,6 +22,7 @@ INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN-$(CONFIG_X86) += xen-hvmcrash INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd +INSTALL_SBIN-$(CONFIG_X86) += xen-memshare-tool INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump INSTALL_SBIN-$(CONFIG_X86) += xen-ucode INSTALL_SBIN += xencov @@ -32,7 +33,6 @@ INSTALL_SBIN += xenpm INSTALL_SBIN += xenwatchdogd INSTALL_SBIN += xen-access INSTALL_SBIN += xen-livepatch -INSTALL_SBIN += xen-memshare-tool INSTALL_SBIN += xen-diag INSTALL_SBIN += $(INSTALL_SBIN-y) ~Andrew
Andrew Cooper writes ("Re: [PATCH 3/3] tools: Move memshrtool from tests/ to misc/"):
> On 13/01/2021 13:01, Ian Jackson wrote:
> > Andrew Cooper writes ("[PATCH 3/3] tools: Move memshrtool from tests/ to misc/"):
> >> memshrtool is a tool for a human to use, rather than a test. Move it into
> >> misc/ as a more appropriate location to live. Also rename it to
> >> xen-memshare-tool
> > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
>
> Thanks, but I expect that Gitlab will tell me that I broke the ARM
> build, by losing a "only build this for x86"-ism.
>
> I've folded this delta in to resolve:
Ooops. Thanks.
Ian.
diff --git a/.gitignore b/.gitignore index 630bdf5b99..35957cc21f 100644 --- a/.gitignore +++ b/.gitignore @@ -273,7 +273,6 @@ tools/tests/x86_emulator/test_x86_emulator tools/tests/x86_emulator/x86_emulate tools/tests/x86_emulator/xop*.[ch] tools/tests/xenstore/xs-test -tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj tools/tests/vpci/list.h tools/tests/vpci/vpci.[hc] diff --git a/tools/misc/.gitignore b/tools/misc/.gitignore index e332ed4ec7..a01bc5b5b5 100644 --- a/tools/misc/.gitignore +++ b/tools/misc/.gitignore @@ -1,2 +1,3 @@ xen-access +xen-memshare-tool xen-ucode diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 612b7002e5..fbe010a55a 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -32,6 +32,7 @@ INSTALL_SBIN += xenpm INSTALL_SBIN += xenwatchdogd INSTALL_SBIN += xen-access INSTALL_SBIN += xen-livepatch +INSTALL_SBIN += xen-memshare-tool INSTALL_SBIN += xen-diag INSTALL_SBIN += $(INSTALL_SBIN-y) @@ -86,6 +87,9 @@ xen-hvmctx: xen-hvmctx.o xen-hvmcrash: xen-hvmcrash.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xen-memshare-tool: xen-memshare-tool.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + xenperf: xenperf.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) diff --git a/tools/tests/mem-sharing/memshrtool.c b/tools/misc/xen-memshare-tool.c similarity index 100% rename from tools/tests/mem-sharing/memshrtool.c rename to tools/misc/xen-memshare-tool.c diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 771715be0f..fc9b715951 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -4,7 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test -SUBDIRS-y += mem-sharing ifneq ($(clang),y) SUBDIRS-$(CONFIG_X86) += x86_emulator endif diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile deleted file mode 100644 index 5cd96e4cc9..0000000000 --- a/tools/tests/mem-sharing/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -XEN_ROOT=$(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Werror - -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_xeninclude) - -TARGETS-y := -TARGETS-$(CONFIG_X86) += memshrtool -TARGETS := $(TARGETS-y) - -.PHONY: all -all: build - -.PHONY: build -build: $(TARGETS) - -.PHONY: clean -clean: - $(RM) *.o $(TARGETS) *~ $(DEPS_RM) - -.PHONY: distclean -distclean: clean - -memshrtool: memshrtool.o - $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) - --include $(DEPS_INCLUDE) - -install uninstall:
memshrtool is a tool for a human to use, rather than a test. Move it into misc/ as a more appropriate location to live. Also rename it to xen-memshare-tool Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Ian Jackson <iwj@xenproject.org> I'm debating dropping the tool suffix, because I don't think that's much help either. --- .gitignore | 1 - tools/misc/.gitignore | 1 + tools/misc/Makefile | 4 +++ .../memshrtool.c => misc/xen-memshare-tool.c} | 0 tools/tests/Makefile | 1 - tools/tests/mem-sharing/Makefile | 31 ---------------------- 6 files changed, 5 insertions(+), 33 deletions(-) rename tools/{tests/mem-sharing/memshrtool.c => misc/xen-memshare-tool.c} (100%) delete mode 100644 tools/tests/mem-sharing/Makefile