mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Acked-by: Tamas K Lengyel <tamas@tklengyel.com>
This commit is contained in:
Andrew Cooper committed
1 parent
ec6c5d3998
commit
2de2674356
7 files changed
+7
-36
No files matched your search
@@ -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
|
||||
|
||||
+1
-1
@@ -486,7 +486,7 @@ M: Tamas K Lengyel <tamas@tklengyel.com>
|
||||
R: Alexandru Isaila <aisaila@bitdefender.com>
|
||||
R: Petre Pircalabu <ppircalabu@bitdefender.com>
|
||||
S: Supported
|
||||
F: tools/tests/xen-access
|
||||
F: tools/misc/xen-access.c
|
||||
F: xen/arch/*/monitor.c
|
||||
F: xen/arch/*/vm_event.c
|
||||
F: xen/arch/arm/mem_access.c
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
xen-access
|
||||
xen-ucode
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||