diff options
-rw-r--r-- | .rootkeys | 68 | ||||
-rw-r--r-- | tools/Makefile | 1 | ||||
-rw-r--r-- | tools/Rules.mk | 1 | ||||
-rw-r--r-- | tools/blktap/Makefile | 9 | ||||
-rw-r--r-- | tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in | 2 | ||||
-rwxr-xr-x | tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure | 2 | ||||
-rw-r--r-- | tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in | 2 | ||||
-rw-r--r-- | tools/ioemu/target-i386-dm/Makefile | 2 | ||||
-rw-r--r-- | tools/libxc/Makefile | 5 | ||||
-rw-r--r-- | tools/libxc/xc_private.h | 2 | ||||
-rw-r--r-- | tools/misc/Makefile | 2 | ||||
-rw-r--r-- | tools/misc/cpuperf/Makefile | 2 | ||||
-rw-r--r-- | tools/python/setup.py | 4 | ||||
-rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 1 | ||||
-rw-r--r-- | tools/vnet/Makefile | 11 | ||||
-rw-r--r-- | tools/vnet/libxutil/Makefile (renamed from tools/libxutil/Makefile) | 2 | ||||
-rw-r--r-- | tools/vnet/libxutil/allocate.c (renamed from tools/libxutil/allocate.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/allocate.h (renamed from tools/libxutil/allocate.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/debug.h (renamed from tools/libxutil/debug.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/enum.c (renamed from tools/libxutil/enum.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/enum.h (renamed from tools/libxutil/enum.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/fd_stream.c (renamed from tools/libxutil/fd_stream.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/fd_stream.h (renamed from tools/libxutil/fd_stream.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/file_stream.c (renamed from tools/libxutil/file_stream.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/file_stream.h (renamed from tools/libxutil/file_stream.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/gzip_stream.c (renamed from tools/libxutil/gzip_stream.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/gzip_stream.h (renamed from tools/libxutil/gzip_stream.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/hash_table.c (renamed from tools/libxutil/hash_table.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/hash_table.h (renamed from tools/libxutil/hash_table.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/iostream.c (renamed from tools/libxutil/iostream.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/iostream.h (renamed from tools/libxutil/iostream.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/kernel_stream.c (renamed from tools/libxutil/kernel_stream.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/kernel_stream.h (renamed from tools/libxutil/kernel_stream.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/lexis.c (renamed from tools/libxutil/lexis.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/lexis.h (renamed from tools/libxutil/lexis.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/socket_stream.c (renamed from tools/libxutil/socket_stream.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/socket_stream.h (renamed from tools/libxutil/socket_stream.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/string_stream.c (renamed from tools/libxutil/string_stream.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/string_stream.h (renamed from tools/libxutil/string_stream.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sxpr.c (renamed from tools/libxutil/sxpr.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sxpr.h (renamed from tools/libxutil/sxpr.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sxpr_parser.c (renamed from tools/libxutil/sxpr_parser.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sxpr_parser.h (renamed from tools/libxutil/sxpr_parser.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sys_net.c (renamed from tools/libxutil/sys_net.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sys_net.h (renamed from tools/libxutil/sys_net.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sys_string.c (renamed from tools/libxutil/sys_string.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/sys_string.h (renamed from tools/libxutil/sys_string.h) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/util.c (renamed from tools/libxutil/util.c) | 0 | ||||
-rw-r--r-- | tools/vnet/libxutil/util.h (renamed from tools/libxutil/util.h) | 0 | ||||
-rw-r--r-- | tools/vnet/vnet-module/Makefile.vnet | 2 | ||||
-rw-r--r-- | tools/vnet/vnetd/Makefile | 2 | ||||
-rw-r--r-- | tools/xcs/Makefile | 7 | ||||
-rw-r--r-- | tools/xcutils/Makefile | 2 | ||||
-rw-r--r-- | tools/xentrace/Makefile | 3 |
54 files changed, 62 insertions, 70 deletions
@@ -698,40 +698,6 @@ 4273458duzL--nsTfT6e_q6Kfij48g tools/libxc/xc_ptrace_core.c 41ebbfe9U0b0kI-HgjK7VEY4EvW7_w tools/libxc/xc_sedf.c 41dde8b0pLfAKMs_L9Uri2hnzHiCRQ tools/libxc/xc_vmx_build.c -40e1b09dMYB4ItGCqcMIzirdMd9I-w tools/libxutil/Makefile -40e033325Sjqs-_4TuzeUEprP_gYFg tools/libxutil/allocate.c -40e03332KYz7o1bn2MG_KPbBlyoIMA tools/libxutil/allocate.h -41a216cav5JJbtDQnusfuMa_1x_Xpw tools/libxutil/debug.h -40e9808eyjiahG5uF6AMelNVujBzCg tools/libxutil/enum.c -40e9808eZpbdn9q2KSSMGCNvY_ZgpQ tools/libxutil/enum.h -4284c2ecWyadIhHF1u_QSgWqIXkaLA tools/libxutil/fd_stream.c -4284c2ecEOOcF6fZUf_NsZzYAoNo-w tools/libxutil/fd_stream.h -40e03332p5Dc_owJQRuN72ymJZddFQ tools/libxutil/file_stream.c -40e03332jWfB2viAhLSkq1WK0r_iDQ tools/libxutil/file_stream.h -40e03332rUjNMGg11n2rN6V4DCrvOg tools/libxutil/gzip_stream.c -40e033321O5Qg22haLoq5lpmk4tooQ tools/libxutil/gzip_stream.h -40e9808easXCzzAZQodEfKAhgUXSPA tools/libxutil/hash_table.c -40e9808e94BNXIVVKBFHC3rnkvwtJg tools/libxutil/hash_table.h -40e03332ihnBGzHykVwZnFmkAppb4g tools/libxutil/iostream.c -40e03332UGwbLR4wsw4ft14p0Yw5pg tools/libxutil/iostream.h -40e0333245DLDzJemeSVBLuutHtzEQ tools/libxutil/kernel_stream.c -40e03332aK0GkgpDdc-PVTkWKTeOBg tools/libxutil/kernel_stream.h -40e9808epW9iHcLXuO3QfUfLzB7onw tools/libxutil/lexis.c -40e9808egccMhCizayQRGtpBA3L5MQ tools/libxutil/lexis.h -41a216caM4z39Fzjb91rv9Ed_4By1A tools/libxutil/socket_stream.c -41a216caqinvF1I5FQMHA4HTRz8MSA tools/libxutil/socket_stream.h -40e03332KT_tnnoAMbPVAZBB7kSOAQ tools/libxutil/string_stream.c -40e03332-VtK6_OZa1vMHXFil8uq6w tools/libxutil/string_stream.h -40e9808e5_PLdodqVOSx0b4T_f5aeg tools/libxutil/sxpr.c -40e9808e0O4sHZtkDv5hlSqjYcdQAQ tools/libxutil/sxpr.h -40ec1cc6SIiGbynOi-1NtPesOlzF-Q tools/libxutil/sxpr_parser.c -40ec1cc6wpvvGxZiq4EFvNOcw0tUFg tools/libxutil/sxpr_parser.h -40e03332Rkvq6nn_UNjzAAK_Tk9v1g tools/libxutil/sys_net.c -40e03332lQHvQHw4Rh7VsT1_sui29A tools/libxutil/sys_net.h -40e033321smklZd7bDSdWvQCeIshtg tools/libxutil/sys_string.c -40e03332h5V611rRWURRLqb1Ekatxg tools/libxutil/sys_string.h -41a216cayFe2FQroFuzvNPw1AvNiqQ tools/libxutil/util.c -41a216ca7mgVSnCBHPCLkGOIqPS1CQ tools/libxutil/util.h 3f776bd2Xd-dUcPKlPN2vG89VGtfvQ tools/misc/Makefile 4225f56d7sa9aEARfjNeCVTMYDAmZA tools/misc/cpuperf/Makefile 4225f56dS5TGdKojmuBnrV3PzbE6Rg tools/misc/cpuperf/README.txt @@ -967,6 +933,40 @@ 41a21888QPgKrulCfR9SY_pxZKU0KA tools/vnet/examples/vnet97.sxp 41a21888Gm0UBs1i7HqveT7Yz0u8DQ tools/vnet/examples/vnet98.sxp 41a21888r4oGPuGv2Lxl-thgV3H54w tools/vnet/examples/vnet99.sxp +40e1b09dMYB4ItGCqcMIzirdMd9I-w tools/vnet/libxutil/Makefile +40e033325Sjqs-_4TuzeUEprP_gYFg tools/vnet/libxutil/allocate.c +40e03332KYz7o1bn2MG_KPbBlyoIMA tools/vnet/libxutil/allocate.h +41a216cav5JJbtDQnusfuMa_1x_Xpw tools/vnet/libxutil/debug.h +40e9808eyjiahG5uF6AMelNVujBzCg tools/vnet/libxutil/enum.c +40e9808eZpbdn9q2KSSMGCNvY_ZgpQ tools/vnet/libxutil/enum.h +4284c2ecWyadIhHF1u_QSgWqIXkaLA tools/vnet/libxutil/fd_stream.c +4284c2ecEOOcF6fZUf_NsZzYAoNo-w tools/vnet/libxutil/fd_stream.h +40e03332p5Dc_owJQRuN72ymJZddFQ tools/vnet/libxutil/file_stream.c +40e03332jWfB2viAhLSkq1WK0r_iDQ tools/vnet/libxutil/file_stream.h +40e03332rUjNMGg11n2rN6V4DCrvOg tools/vnet/libxutil/gzip_stream.c +40e033321O5Qg22haLoq5lpmk4tooQ tools/vnet/libxutil/gzip_stream.h +40e9808easXCzzAZQodEfKAhgUXSPA tools/vnet/libxutil/hash_table.c +40e9808e94BNXIVVKBFHC3rnkvwtJg tools/vnet/libxutil/hash_table.h +40e03332ihnBGzHykVwZnFmkAppb4g tools/vnet/libxutil/iostream.c +40e03332UGwbLR4wsw4ft14p0Yw5pg tools/vnet/libxutil/iostream.h +40e0333245DLDzJemeSVBLuutHtzEQ tools/vnet/libxutil/kernel_stream.c +40e03332aK0GkgpDdc-PVTkWKTeOBg tools/vnet/libxutil/kernel_stream.h +40e9808epW9iHcLXuO3QfUfLzB7onw tools/vnet/libxutil/lexis.c +40e9808egccMhCizayQRGtpBA3L5MQ tools/vnet/libxutil/lexis.h +41a216caM4z39Fzjb91rv9Ed_4By1A tools/vnet/libxutil/socket_stream.c +41a216caqinvF1I5FQMHA4HTRz8MSA tools/vnet/libxutil/socket_stream.h +40e03332KT_tnnoAMbPVAZBB7kSOAQ tools/vnet/libxutil/string_stream.c +40e03332-VtK6_OZa1vMHXFil8uq6w tools/vnet/libxutil/string_stream.h +40e9808e5_PLdodqVOSx0b4T_f5aeg tools/vnet/libxutil/sxpr.c +40e9808e0O4sHZtkDv5hlSqjYcdQAQ tools/vnet/libxutil/sxpr.h +40ec1cc6SIiGbynOi-1NtPesOlzF-Q tools/vnet/libxutil/sxpr_parser.c +40ec1cc6wpvvGxZiq4EFvNOcw0tUFg tools/vnet/libxutil/sxpr_parser.h +40e03332Rkvq6nn_UNjzAAK_Tk9v1g tools/vnet/libxutil/sys_net.c +40e03332lQHvQHw4Rh7VsT1_sui29A tools/vnet/libxutil/sys_net.h +40e033321smklZd7bDSdWvQCeIshtg tools/vnet/libxutil/sys_string.c +40e03332h5V611rRWURRLqb1Ekatxg tools/vnet/libxutil/sys_string.h +41a216cayFe2FQroFuzvNPw1AvNiqQ tools/vnet/libxutil/util.c +41a216ca7mgVSnCBHPCLkGOIqPS1CQ tools/vnet/libxutil/util.h 41a21888c9TCRlUwJS9WBjB3e9aWgg tools/vnet/vnet-module/00README 41a21888K2ItolEkksc1MUqyTDI_Kg tools/vnet/vnet-module/Makefile 41a21888mJsFJD7bVMm-nrnWnalGBw tools/vnet/vnet-module/Makefile-2.4 diff --git a/tools/Makefile b/tools/Makefile index 2ffa481328..4e29741f5f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -2,7 +2,6 @@ XEN_ROOT = ../ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS := -SUBDIRS += libxutil SUBDIRS += libxc SUBDIRS += misc SUBDIRS += examples diff --git a/tools/Rules.mk b/tools/Rules.mk index 6e811b9611..5b79d37ff7 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -4,7 +4,6 @@ include $(XEN_ROOT)/Config.mk XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc XEN_LIBXC = $(XEN_ROOT)/tools/libxc -XEN_LIBXUTIL = $(XEN_ROOT)/tools/libxutil ifeq ($(XEN_TARGET_ARCH),x86_32) CFLAGS += -m32 -march=i686 diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index 26187de779..9807e05387 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -47,7 +47,6 @@ CFLAGS += -Wno-unused CFLAGS += -g3 CFLAGS += -fno-strict-aliasing CFLAGS += -I $(XEN_LIBXC) -CFLAGS += -I $(XEN_LIBXUTIL) CFLAGS += $(INCLUDES) -I. CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # Get gcc to generate the dependencies for us. @@ -97,16 +96,16 @@ libblktap.so: libblktap.so.$(MAJOR): ln -sf libblktap.so.$(MAJOR).$(MINOR) $@ libblktap.so.$(MAJOR).$(MINOR): $(OBJS) - $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -lpthread -L../libxutil -lxutil -lz + $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -lpthread -lz blkdump: $(LIB) - $(CC) $(CFLAGS) -o blkdump -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -l blktap blkdump.c + $(CC) $(CFLAGS) -o blkdump -L$(XEN_LIBXC) -L. -l blktap blkdump.c parallax: $(LIB) $(PLX_SRCS) - $(CC) $(CFLAGS) -o parallax -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -lblktap -lpthread $(PLX_SRCS) + $(CC) $(CFLAGS) -o parallax -L$(XEN_LIBXC) -L. -lblktap -lpthread $(PLX_SRCS) parallax-threaded: $(LIB) $(PLXT_SRCS) - $(CC) $(CFLAGS) -o parallax-threaded -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -lpthread -lblktap $(PLXT_SRCS) + $(CC) $(CFLAGS) -o parallax-threaded -L$(XEN_LIBXC) -L. -lpthread -lblktap $(PLXT_SRCS) vdi_list: $(LIB) vdi_list.c $(VDI_SRCS) $(CC) $(CFLAGS) -g3 -o vdi_list vdi_list.c -lpthread $(VDI_SRCS) diff --git a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in index 93f177387c..f6843357e7 100644 --- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in +++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in @@ -83,7 +83,7 @@ READLINE_DEP = $$(READLINE_DIR) # -I. for config files. # -I${srcdir} for our headers. # -I$(srcdir)/../regformats for regdef.h. -INCLUDE_CFLAGS = -I. -I${srcdir} -I$(srcdir)/../regformats -I$(INCLUDE_DIR) -I../../../../libxc/ -I../../../../libxutil/ +INCLUDE_CFLAGS = -I. -I${srcdir} -I$(srcdir)/../regformats -I$(INCLUDE_DIR) -I../../../../libxc/ # M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS # from the config/ directory. diff --git a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure index e81046517a..d45d933ab3 100755 --- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure +++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure @@ -3475,7 +3475,7 @@ USE_THREAD_DB= GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles" -GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil" +GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -lxc" diff --git a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in index 032eabe345..1d5c22af0b 100644 --- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in +++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in @@ -107,7 +107,7 @@ USE_THREAD_DB= GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles" -GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil" +GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -lxc" AC_SUBST(GDBSERVER_DEPFILES) AC_SUBST(GDBSERVER_LIBS) diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile index 385f838800..945f38178e 100644 --- a/tools/ioemu/target-i386-dm/Makefile +++ b/tools/ioemu/target-i386-dm/Makefile @@ -189,7 +189,7 @@ endif ######################################################### DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -LIBS+=-lm -L../../libxc -L../../libxutil -lxc -lxutil +LIBS+=-lm -L../../libxc -lxc ifndef CONFIG_USER_ONLY LIBS+=-lz endif diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index e5db1adcf6..66f01d9489 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -12,9 +12,6 @@ CC = gcc XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk -vpath %c $(XEN_LIBXUTIL) -INCLUDES += -I $(XEN_LIBXUTIL) - SRCS := SRCS += xc_sedf.c SRCS += xc_bvtsched.c @@ -105,6 +102,6 @@ libxc.so.$(MAJOR): libxc.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxc.so.$(MAJOR).$(MINOR): $(PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -lz -include $(DEPS) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index f454b5e9b1..ec8b21c21c 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -232,8 +232,6 @@ typedef struct mfn_mapper { } mfn_mapper_t; -#include "xc_io.h" - unsigned long xc_get_m2p_start_mfn ( int xc_handle ); long xc_get_tot_pages(int xc_handle, u32 domid); diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 43e68949c2..5281e94e00 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -45,4 +45,4 @@ clean: $(CC) -c $(CFLAGS) -o $@ $< $(TARGETS): %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc -L$(XEN_LIBXUTIL) -lxutil + $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc diff --git a/tools/misc/cpuperf/Makefile b/tools/misc/cpuperf/Makefile index 92b334fe7a..c33e7d9250 100644 --- a/tools/misc/cpuperf/Makefile +++ b/tools/misc/cpuperf/Makefile @@ -38,7 +38,7 @@ clean: $(CC) $(CFLAGS) -o $@ $< cpuperf-xen: cpuperf.c $(HDRS) Makefile - $(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxc -L$(XEN_LIBXUTIL) -lxutil -DXENO -o $@ $< + $(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxc -DXENO -o $@ $< cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile $(CC) $(CFLAGS) -DPERFCNTR -o $@ $< diff --git a/tools/python/setup.py b/tools/python/setup.py index 0a2fde5f9c..76861908a6 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -9,15 +9,13 @@ extra_compile_args = [ "-fno-strict-aliasing", "-Wall", "-Werror" ] include_dirs = [ XEN_ROOT + "/tools/python/xen/lowlevel/xu", XEN_ROOT + "/tools/libxc", - XEN_ROOT + "/tools/libxutil", XEN_ROOT + "/tools/xcs", ] library_dirs = [ XEN_ROOT + "/tools/libxc", - XEN_ROOT + "/tools/libxutil", ] -libraries = [ "xc", "xutil" ] +libraries = [ "xc" ] xc = Extension("xc", extra_compile_args = extra_compile_args, diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 653d7c01d1..c23bc461e1 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -15,7 +15,6 @@ #include <netdb.h> #include <arpa/inet.h> #include "xc_private.h" -#include "gzip_stream.h" #include "linux_boot_params.h" /* Needed for Python versions earlier than 2.3. */ diff --git a/tools/vnet/Makefile b/tools/vnet/Makefile index d4d8183130..a5156c4687 100644 --- a/tools/vnet/Makefile +++ b/tools/vnet/Makefile @@ -7,11 +7,11 @@ export prefix?=$(shell cd ../../dist/install && pwd) .PHONY: all compile .PHONY: gc-install gc-clean gc-prstine -.PHONY: vnetd vnet-module install dist clean pristine +.PHONY: libxutil vnetd vnet-module install dist clean pristine all: compile -compile: vnetd vnet-module +compile: libxutil vnetd vnet-module #compile: vnet-module gc.tar.gz: @@ -32,6 +32,9 @@ gc-clean: gc-pristine: -rm -rf gc?.? gc +libxutil: + $(MAKE) -C libxutil + vnetd: gc-install $(MAKE) -C vnetd @@ -39,13 +42,15 @@ vnet-module: $(MAKE) -C vnet-module install: compile + $(MAKE) -C libxutil install $(MAKE) -C vnetd install $(MAKE) -C vnet-module install $(MAKE) -C examples install clean: + -$(MAKE) -C libxutil clean -$(MAKE) -C vnetd clean -$(MAKE) -C vnet-module clean -rm -rf gc?.? gc - + pristine: clean gc-pristine diff --git a/tools/libxutil/Makefile b/tools/vnet/libxutil/Makefile index 1a3ed9b109..5e9adaac8b 100644 --- a/tools/libxutil/Makefile +++ b/tools/vnet/libxutil/Makefile @@ -1,5 +1,5 @@ -XEN_ROOT = ../.. +XEN_ROOT = ../../.. INSTALL = install INSTALL_DATA = $(INSTALL) -m0644 INSTALL_PROG = $(INSTALL) -m0755 diff --git a/tools/libxutil/allocate.c b/tools/vnet/libxutil/allocate.c index 600ebabda6..600ebabda6 100644 --- a/tools/libxutil/allocate.c +++ b/tools/vnet/libxutil/allocate.c diff --git a/tools/libxutil/allocate.h b/tools/vnet/libxutil/allocate.h index 391b7be2bd..391b7be2bd 100644 --- a/tools/libxutil/allocate.h +++ b/tools/vnet/libxutil/allocate.h diff --git a/tools/libxutil/debug.h b/tools/vnet/libxutil/debug.h index 1f5a19d54d..1f5a19d54d 100644 --- a/tools/libxutil/debug.h +++ b/tools/vnet/libxutil/debug.h diff --git a/tools/libxutil/enum.c b/tools/vnet/libxutil/enum.c index 95f6e31a87..95f6e31a87 100644 --- a/tools/libxutil/enum.c +++ b/tools/vnet/libxutil/enum.c diff --git a/tools/libxutil/enum.h b/tools/vnet/libxutil/enum.h index cdc0f6f1b1..cdc0f6f1b1 100644 --- a/tools/libxutil/enum.h +++ b/tools/vnet/libxutil/enum.h diff --git a/tools/libxutil/fd_stream.c b/tools/vnet/libxutil/fd_stream.c index 428f0a5ff0..428f0a5ff0 100644 --- a/tools/libxutil/fd_stream.c +++ b/tools/vnet/libxutil/fd_stream.c diff --git a/tools/libxutil/fd_stream.h b/tools/vnet/libxutil/fd_stream.h index b37a6863e2..b37a6863e2 100644 --- a/tools/libxutil/fd_stream.h +++ b/tools/vnet/libxutil/fd_stream.h diff --git a/tools/libxutil/file_stream.c b/tools/vnet/libxutil/file_stream.c index 7adbac0fa7..7adbac0fa7 100644 --- a/tools/libxutil/file_stream.c +++ b/tools/vnet/libxutil/file_stream.c diff --git a/tools/libxutil/file_stream.h b/tools/vnet/libxutil/file_stream.h index f717656c24..f717656c24 100644 --- a/tools/libxutil/file_stream.h +++ b/tools/vnet/libxutil/file_stream.h diff --git a/tools/libxutil/gzip_stream.c b/tools/vnet/libxutil/gzip_stream.c index ea14b82580..ea14b82580 100644 --- a/tools/libxutil/gzip_stream.c +++ b/tools/vnet/libxutil/gzip_stream.c diff --git a/tools/libxutil/gzip_stream.h b/tools/vnet/libxutil/gzip_stream.h index fd28e39575..fd28e39575 100644 --- a/tools/libxutil/gzip_stream.h +++ b/tools/vnet/libxutil/gzip_stream.h diff --git a/tools/libxutil/hash_table.c b/tools/vnet/libxutil/hash_table.c index 13da946e77..13da946e77 100644 --- a/tools/libxutil/hash_table.c +++ b/tools/vnet/libxutil/hash_table.c diff --git a/tools/libxutil/hash_table.h b/tools/vnet/libxutil/hash_table.h index 6608b49cda..6608b49cda 100644 --- a/tools/libxutil/hash_table.h +++ b/tools/vnet/libxutil/hash_table.h diff --git a/tools/libxutil/iostream.c b/tools/vnet/libxutil/iostream.c index 39a62173ad..39a62173ad 100644 --- a/tools/libxutil/iostream.c +++ b/tools/vnet/libxutil/iostream.c diff --git a/tools/libxutil/iostream.h b/tools/vnet/libxutil/iostream.h index f41ca56629..f41ca56629 100644 --- a/tools/libxutil/iostream.h +++ b/tools/vnet/libxutil/iostream.h diff --git a/tools/libxutil/kernel_stream.c b/tools/vnet/libxutil/kernel_stream.c index 3c6b55223d..3c6b55223d 100644 --- a/tools/libxutil/kernel_stream.c +++ b/tools/vnet/libxutil/kernel_stream.c diff --git a/tools/libxutil/kernel_stream.h b/tools/vnet/libxutil/kernel_stream.h index 0f18058d59..0f18058d59 100644 --- a/tools/libxutil/kernel_stream.h +++ b/tools/vnet/libxutil/kernel_stream.h diff --git a/tools/libxutil/lexis.c b/tools/vnet/libxutil/lexis.c index d3441f0c38..d3441f0c38 100644 --- a/tools/libxutil/lexis.c +++ b/tools/vnet/libxutil/lexis.c diff --git a/tools/libxutil/lexis.h b/tools/vnet/libxutil/lexis.h index d49a3547d6..d49a3547d6 100644 --- a/tools/libxutil/lexis.h +++ b/tools/vnet/libxutil/lexis.h diff --git a/tools/libxutil/socket_stream.c b/tools/vnet/libxutil/socket_stream.c index 9e90b4e06e..9e90b4e06e 100644 --- a/tools/libxutil/socket_stream.c +++ b/tools/vnet/libxutil/socket_stream.c diff --git a/tools/libxutil/socket_stream.h b/tools/vnet/libxutil/socket_stream.h index 9da23e9f01..9da23e9f01 100644 --- a/tools/libxutil/socket_stream.h +++ b/tools/vnet/libxutil/socket_stream.h diff --git a/tools/libxutil/string_stream.c b/tools/vnet/libxutil/string_stream.c index 907e7d70ee..907e7d70ee 100644 --- a/tools/libxutil/string_stream.c +++ b/tools/vnet/libxutil/string_stream.c diff --git a/tools/libxutil/string_stream.h b/tools/vnet/libxutil/string_stream.h index 246e63d2fe..246e63d2fe 100644 --- a/tools/libxutil/string_stream.h +++ b/tools/vnet/libxutil/string_stream.h diff --git a/tools/libxutil/sxpr.c b/tools/vnet/libxutil/sxpr.c index d264527f25..d264527f25 100644 --- a/tools/libxutil/sxpr.c +++ b/tools/vnet/libxutil/sxpr.c diff --git a/tools/libxutil/sxpr.h b/tools/vnet/libxutil/sxpr.h index c9acd7b25f..c9acd7b25f 100644 --- a/tools/libxutil/sxpr.h +++ b/tools/vnet/libxutil/sxpr.h diff --git a/tools/libxutil/sxpr_parser.c b/tools/vnet/libxutil/sxpr_parser.c index f93d3505b2..f93d3505b2 100644 --- a/tools/libxutil/sxpr_parser.c +++ b/tools/vnet/libxutil/sxpr_parser.c diff --git a/tools/libxutil/sxpr_parser.h b/tools/vnet/libxutil/sxpr_parser.h index 591ed95572..591ed95572 100644 --- a/tools/libxutil/sxpr_parser.h +++ b/tools/vnet/libxutil/sxpr_parser.h diff --git a/tools/libxutil/sys_net.c b/tools/vnet/libxutil/sys_net.c index 41436019b5..41436019b5 100644 --- a/tools/libxutil/sys_net.c +++ b/tools/vnet/libxutil/sys_net.c diff --git a/tools/libxutil/sys_net.h b/tools/vnet/libxutil/sys_net.h index 61754940f2..61754940f2 100644 --- a/tools/libxutil/sys_net.h +++ b/tools/vnet/libxutil/sys_net.h diff --git a/tools/libxutil/sys_string.c b/tools/vnet/libxutil/sys_string.c index 22a8ae3688..22a8ae3688 100644 --- a/tools/libxutil/sys_string.c +++ b/tools/vnet/libxutil/sys_string.c diff --git a/tools/libxutil/sys_string.h b/tools/vnet/libxutil/sys_string.h index 88d9d8db61..88d9d8db61 100644 --- a/tools/libxutil/sys_string.h +++ b/tools/vnet/libxutil/sys_string.h diff --git a/tools/libxutil/util.c b/tools/vnet/libxutil/util.c index 0ac388b3b8..0ac388b3b8 100644 --- a/tools/libxutil/util.c +++ b/tools/vnet/libxutil/util.c diff --git a/tools/libxutil/util.h b/tools/vnet/libxutil/util.h index b4a170512f..b4a170512f 100644 --- a/tools/libxutil/util.h +++ b/tools/vnet/libxutil/util.h diff --git a/tools/vnet/vnet-module/Makefile.vnet b/tools/vnet/vnet-module/Makefile.vnet index 366c2fc9b9..2bc07b8f92 100644 --- a/tools/vnet/vnet-module/Makefile.vnet +++ b/tools/vnet/vnet-module/Makefile.vnet @@ -24,7 +24,7 @@ else SRC_DIR=$(src)/ endif -LIB_DIR := $(SRC_DIR)../../libxutil +LIB_DIR := $(SRC_DIR)../libxutil VNET_SRC := VNET_SRC += esp.c diff --git a/tools/vnet/vnetd/Makefile b/tools/vnet/vnetd/Makefile index 3783fa3833..a7afa94384 100644 --- a/tools/vnet/vnetd/Makefile +++ b/tools/vnet/vnetd/Makefile @@ -25,7 +25,7 @@ include $(XEN_ROOT)/tools/Rules.mk VNETD_INSTALL_DIR = /usr/sbin -LIB_DIR = $(XEN_LIBXUTIL) +LIB_DIR = ../libxutil VNET_DIR = ../vnet-module INCLUDES += -I$(LIB_DIR) diff --git a/tools/xcs/Makefile b/tools/xcs/Makefile index e3b4380411..c3c4bdfa82 100644 --- a/tools/xcs/Makefile +++ b/tools/xcs/Makefile @@ -15,7 +15,6 @@ CFLAGS = -Wall -Werror -g3 -D _XOPEN_SOURCE=600 CFLAGS += -I $(XEN_XC) CFLAGS += -I $(XEN_LIBXC) -CFLAGS += -I $(XEN_LIBXUTIL) SRCS := SRCS += ctrl_interface.c @@ -34,11 +33,11 @@ clean: $(RM) *.a *.so *.o *.rpm $(BIN) xcsdump xcsdump: xcsdump.c dump.c - $(CC) $(CFLAGS) -o xcsdump xcsdump.c -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) \ - ctrl_interface.c evtchn.c dump.c -lxc -lxutil + $(CC) $(CFLAGS) -o xcsdump xcsdump.c -L$(XEN_LIBXC) \ + ctrl_interface.c evtchn.c dump.c -lxc $(BIN): $(OBJS) - $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -lxc -lxutil + $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -lxc $(OBJS): $(HDRS) diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 1175ff5713..d4e0ebad0f 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -30,7 +30,7 @@ PROG_DEP = .*.d PROGRAMS = xc_restore xc_save -LDLIBS = -L$(XEN_LIBXC) -lxc -L$(XEN_LIBXUTIL) -lxutil +LDLIBS = -L$(XEN_LIBXC) -lxc .PHONY: all all: build diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index faa0a46bf8..329d71c3ee 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -10,7 +10,6 @@ CFLAGS += -Wall -Werror -O3 CFLAGS += -I $(XEN_XC) CFLAGS += -I $(XEN_LIBXC) -CFLAGS += -I $(XEN_LIBXUTIL) HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) @@ -37,4 +36,4 @@ clean: $(RM) *.a *.so *.o *.rpm $(BIN) %: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -lxc -lxutil + $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc |