From patchwork Wed Jan 13 12:34:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12016711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A03CDC433DB for ; Wed, 13 Jan 2021 12:35:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 426CA23382 for ; Wed, 13 Jan 2021 12:35:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 426CA23382 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.66443.118019 (Exim 4.92) (envelope-from ) id 1kzfN7-0004p0-MR; Wed, 13 Jan 2021 12:35:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66443.118019; Wed, 13 Jan 2021 12:35:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzfN7-0004oh-GA; Wed, 13 Jan 2021 12:35:33 +0000 Received: by outflank-mailman (input) for mailman id 66443; Wed, 13 Jan 2021 12:35:32 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzfN6-0004j8-Gb for xen-devel@lists.xenproject.org; Wed, 13 Jan 2021 12:35:32 +0000 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 11160454-c011-4b72-aa65-cbe71b048d93; Wed, 13 Jan 2021 12:35:27 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 11160454-c011-4b72-aa65-cbe71b048d93 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1610541327; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=nva4nk9kBg/Te01BeKpla9F+vHSqFTlcGn2XzJgwQKQ=; b=BQR5bSTeKMUm8W1Hh9U8m/kwpsbrI1TRByCHLAp5ckR9f03N31sqOOta pFkenzKVavb0HaJQlgas36eX+lQOQs91JjM22nRHvihtPb65lYVx/s1WA TsaqMO/3QqEZOkTt+KCyUUqYKaAI6auSJPetD1bLOq651j3v2VmxpbJVv M=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: ZjBtJKaavLGcap1UG5OxR0cB40okaqPASOn3elK/DkKd2wI7h500Eq3xo8MJOk9O+F/aZxTLA4 jlfKSrn+D7W15ILZKO6q65SaL02QMYhVLrLqmteY6/BQx7uQGOk2ssTG05QA7j+rLXMS8VyRhi gC9AG62HgMNA+Ttk+tm2qQRZiHF5MXaJnqC3X6oS5E3fA34Lcp49do7aUTbU34ZtiAj+iX/exu I9BboDwXwhlFMVRbmaGqsI4mee0CZzETX18R3Ev0hBcWXpuwb8Fe58zUKlqwFH32wajj+7YtdH Qag= X-SBRS: 5.2 X-MesageID: 35041285 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,344,1602561600"; d="scan'208";a="35041285" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Andrew Cooper , Ian Jackson Subject: [PATCH 1/3] tools/tests: Drop obsolete running scripts Date: Wed, 13 Jan 2021 12:34:53 +0000 Message-ID: <20210113123455.23209-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210113123455.23209-1-andrew.cooper3@citrix.com> References: <20210113123455.23209-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 The python unit tests were dropped in Xen 4.12 due to being obsolete, but the scripts to run the tests were missed. Clean up .gitignore as well Also drop the libxenctrl {C,LD}FLAGS adjustments in the Makefile. This logic isn't used, and isn't appropriate even in principle, as there are tests in here which don't want to use libxenctrl. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- CC: Ian Jackson --- .gitignore | 3 -- tools/tests/Makefile | 3 -- tools/tests/run_tests.sh | 61 ------------------------------------- tools/tests/utests/run_all_tests.py | 23 -------------- 4 files changed, 90 deletions(-) delete mode 100644 tools/tests/run_tests.sh delete mode 100644 tools/tests/utests/run_all_tests.py diff --git a/.gitignore b/.gitignore index b169d78ed7..1b54ea3111 100644 --- a/.gitignore +++ b/.gitignore @@ -274,9 +274,6 @@ 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/regression/installed/* -tools/tests/regression/build/* -tools/tests/regression/downloads/* tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj tools/tests/vpci/list.h diff --git a/tools/tests/Makefile b/tools/tests/Makefile index ed3bed404b..9077fa14d3 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += $(CFLAGS_libxenctrl) -LDLIBS += $(LDLIBS_libxenctrl) - SUBDIRS-y := SUBDIRS-$(CONFIG_X86) += cpu-policy SUBDIRS-$(CONFIG_X86) += mce-test diff --git a/tools/tests/run_tests.sh b/tools/tests/run_tests.sh deleted file mode 100644 index c492876b4b..0000000000 --- a/tools/tests/run_tests.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# -# This runs the available unit-tests with all different supported -# python versions. -# -# To run this this must be 'cd'ed to the tests directory. -# - -ENABLE_UNSUPPORTED=0 - -function usage() -{ - printf "Usage: %s: [-u]\n" $0 - printf " -u: run test with unsupported python versions also\n" -} - -function run_one_test() -{ - PYTHON=$1 - PYTHON_EXECUTABLE=`echo $PYTHON | tr -d "-"` - echo "+++ Running tests with $PYTHON" - export LD_LIBRARY_PATH=./regression/installed/$PYTHON/lib - ./regression/installed/$PYTHON/bin/$PYTHON_EXECUTABLE \ - utests/run_all_tests.py - echo "--- Finished tests with $PYTHON" -} - -function run_all_tests() -{ - for PYTHON in $@; - do - run_one_test $PYTHON - done -} - -while getopts u name -do - case $name in - h) usage; exit 0;; - u) ENABLE_UNSUPPORTED=1;; - ?) usage; exit 2;; - esac -done - -# Build the different python versions -(cd regression && make -j4 runtime-environment) - -# Supported: when an unit test fails this should be seen as an error -PYTHON_SUPPORTED="python-2.4 python-2.5 python-2.6" -# Unsupported: failure should be seen as a hint -PYTHON_UNSUPPORTED="python-3.1" - -export PYTHONPATH=`echo $PWD/../python/build/lib.*`:$PWD - -set -e -run_all_tests $PYTHON_SUPPORTED - -if test $ENABLE_UNSUPPORTED -eq 1 -then - run_all_tests $PYTHON_UNSUPPORTED -fi diff --git a/tools/tests/utests/run_all_tests.py b/tools/tests/utests/run_all_tests.py deleted file mode 100644 index 7318c81ff2..0000000000 --- a/tools/tests/utests/run_all_tests.py +++ /dev/null @@ -1,23 +0,0 @@ -#============================================================================ -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; If not, see . -#============================================================================ -# Copyright (C) 2009 flonatel GmbH & Co. KG -#============================================================================ - -import unittest - -suite = unittest.TestSuite([]) - -if __name__ == "__main__": - testresult = unittest.TextTestRunner(verbosity=3).run(suite) - From patchwork Wed Jan 13 12:34:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12016713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25AD8C433E9 for ; Wed, 13 Jan 2021 12:35:44 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CCB5823339 for ; Wed, 13 Jan 2021 12:35:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCB5823339 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.66442.118009 (Exim 4.92) (envelope-from ) id 1kzfN7-0004nQ-16; Wed, 13 Jan 2021 12:35:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66442.118009; Wed, 13 Jan 2021 12:35:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzfN6-0004nG-Tc; Wed, 13 Jan 2021 12:35:32 +0000 Received: by outflank-mailman (input) for mailman id 66442; Wed, 13 Jan 2021 12:35:31 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzfN5-0004iq-HB for xen-devel@lists.xenproject.org; Wed, 13 Jan 2021 12:35:31 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cb1ed4e5-be60-4132-869e-d0a7b25e0178; Wed, 13 Jan 2021 12:35:26 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cb1ed4e5-be60-4132-869e-d0a7b25e0178 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1610541326; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=lsM6AU5fGR8kr33O3g2UUwUGjkJ+Kdkf/6p0p71hTWs=; b=Ivimne2d5h2UvfWYH0Ut6I6nF1p8RfvW7rcsPhpzNwEOkPpo8B6mLfJD DlO+TXtIHKWuw3mhspwrN+te4fgQ8kFI6fpOw/KuQ2OyF4q+d5bIMXu3c nNKe0iMUaLfWAam3MDn2p6oFLnrrXHoLi1x/W92aHmWmemso9wx+0NNQ7 E=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 5DYE8eBCBtl8iIRnZ8GI0wOdAN7pkXjfL3FQX8lyNTQQtQEt06aUGcMz0Vc1fNYgSGAI1kwza9 HzKHobaW/OFxSy9D/vSF7FsZOaKS438FxncFkWdRHV0q0qQ839z0fTmbnSl6od4KLzu863Vx3H adLD/Qk7b2Bp/9Xos18NoDIZZuj/WC5oNC5t/N6rpFGM9Q6a4X3YNfSFrW0rvVg+9BZ/5HIi3Y /nwdTY3qJb9E+EcK3dxzYX5geQcBH7ufUoQdVolr+FHzN6/QGwfSRhzjy5b65Ln2e/5Y2DXhKA 2d4= X-SBRS: 5.2 X-MesageID: 36282269 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,344,1602561600"; d="scan'208";a="36282269" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Andrew Cooper , Ian Jackson , "Tamas K Lengyel" Subject: [PATCH 2/3] tools: Move xen-access from tests/ to misc/ Date: Wed, 13 Jan 2021 12:34:54 +0000 Message-ID: <20210113123455.23209-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210113123455.23209-1-andrew.cooper3@citrix.com> References: <20210113123455.23209-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 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 Acked-by: Ian Jackson Acked-by: Tamas K Lengyel --- CC: Ian Jackson CC: Tamas K Lengyel --- .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 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 #include +#define XC_WANT_COMPAT_DEVICEMODEL_API #include #include #include 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) From patchwork Wed Jan 13 12:34:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12016709 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CB6DC433E0 for ; Wed, 13 Jan 2021 12:35:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2880623339 for ; Wed, 13 Jan 2021 12:35:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2880623339 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.66440.117985 (Exim 4.92) (envelope-from ) id 1kzfN1-0004j2-EV; Wed, 13 Jan 2021 12:35:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 66440.117985; Wed, 13 Jan 2021 12:35:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzfN1-0004iv-BW; Wed, 13 Jan 2021 12:35:27 +0000 Received: by outflank-mailman (input) for mailman id 66440; Wed, 13 Jan 2021 12:35:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzfN0-0004iq-LI for xen-devel@lists.xenproject.org; Wed, 13 Jan 2021 12:35:26 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ed3a4b0d-5b3d-4d2f-9a45-b2b777bc1edc; Wed, 13 Jan 2021 12:35:24 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ed3a4b0d-5b3d-4d2f-9a45-b2b777bc1edc DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1610541324; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=DTUD++QGe7nakZ4ytV0Xii6kTZ6n3vsIQbEGDrgmcfE=; b=QsrROuGIuziBMqXV/+21ztQ2FlaqBnSVhv3k4pL8yKXIcHTGyDsBPqR2 PcIRkvw7yUpcUMMrrR/AUE3Sz5BMYGiMycZMsQxGccx+4qkkDvDT+X2OU sUILFoh7hfjY55805Za4DErp0UHPCMWsgwT8EOY+WkJNcxiX948+4SqyO Q=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: CtF8XTmjcyKpBXN9qF6FeyrGmQtl98TDnPAKcBnp0AW65LX47EWS3KBisFkZECo35lkHR5exBm /UwE3NbiLqXVNpdEcs8BLosb7n4XIP6SIKD5IPhUdSQXcjA6rErNwLkqXK8NSvwIHYTzZr5TiZ VQNwnzaiccXYXH8RSJoWOv2d8FWFgQd0lPR7GqlzFHGMcFr5jVrmaOEvNmBlbujogHd5+H/tbc dmU2FThh+GlWqji5n424nMbrilBjn51ZHZSNL68VgAahTdTFvDbSsLaD40DgX+b5oH5q0LUAPn 86U= X-SBRS: 5.2 X-MesageID: 36282265 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,344,1602561600"; d="scan'208";a="36282265" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Andrew Cooper , Ian Jackson Subject: [PATCH 3/3] tools: Move memshrtool from tests/ to misc/ Date: Wed, 13 Jan 2021 12:34:55 +0000 Message-ID: <20210113123455.23209-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210113123455.23209-1-andrew.cooper3@citrix.com> References: <20210113123455.23209-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 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 Acked-by: Ian Jackson --- CC: Ian Jackson 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 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: