ChangeSet 1.1534.1.1, 2005/05/24 22:17:20+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
Nothing but vnet uses libxutil -- move it there.
Makefile, xc.c, setup.py, configure, configure.in, Makefile.in:
This doesn't use libxutil.
Makefile, Makefile.vnet, Rules.mk:
Move libxutil into vnet since it's only used there.
Many files:
mvdir
b/tools/Makefile | 1
b/tools/Rules.mk | 1
b/tools/blktap/Makefile | 9
b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in | 2
b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure | 2
b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in | 2
b/tools/ioemu/target-i386-dm/Makefile | 2
b/tools/libxc/Makefile | 5
b/tools/libxc/xc_private.h | 2
b/tools/misc/Makefile | 2
b/tools/misc/cpuperf/Makefile | 2
b/tools/python/setup.py | 4
b/tools/python/xen/lowlevel/xc/xc.c | 1
b/tools/vnet/Makefile | 11
b/tools/vnet/libxutil/Makefile | 77
b/tools/vnet/libxutil/allocate.c | 116 +
b/tools/vnet/libxutil/allocate.h | 45
b/tools/vnet/libxutil/debug.h | 72
b/tools/vnet/libxutil/enum.c | 61
b/tools/vnet/libxutil/enum.h | 30
b/tools/vnet/libxutil/fd_stream.c | 184 +
b/tools/vnet/libxutil/fd_stream.h | 36
b/tools/vnet/libxutil/file_stream.c | 220 ++
b/tools/vnet/libxutil/file_stream.h | 35
b/tools/vnet/libxutil/gzip_stream.c | 174 +
b/tools/vnet/libxutil/gzip_stream.h | 30
b/tools/vnet/libxutil/hash_table.c | 640 ++++++
b/tools/vnet/libxutil/hash_table.h | 294 ++
b/tools/vnet/libxutil/iostream.c | 55
b/tools/vnet/libxutil/iostream.h | 269 ++
b/tools/vnet/libxutil/kernel_stream.c | 178 +
b/tools/vnet/libxutil/kernel_stream.h | 29
b/tools/vnet/libxutil/lexis.c | 94
b/tools/vnet/libxutil/lexis.h | 128 +
b/tools/vnet/libxutil/socket_stream.c | 230 ++
b/tools/vnet/libxutil/socket_stream.h | 53
b/tools/vnet/libxutil/string_stream.c | 162 +
b/tools/vnet/libxutil/string_stream.h | 45
b/tools/vnet/libxutil/sxpr.c | 1230 ++++++++++++
b/tools/vnet/libxutil/sxpr.h | 437 ++++
b/tools/vnet/libxutil/sxpr_parser.c | 991 +++++++++
b/tools/vnet/libxutil/sxpr_parser.h | 154 +
b/tools/vnet/libxutil/sys_net.c | 319 +++
b/tools/vnet/libxutil/sys_net.h | 78
b/tools/vnet/libxutil/sys_string.c | 193 +
b/tools/vnet/libxutil/sys_string.h | 92
b/tools/vnet/libxutil/util.c | 106 +
b/tools/vnet/libxutil/util.h | 28
b/tools/vnet/vnet-module/Makefile.vnet | 2
b/tools/vnet/vnetd/Makefile | 2
b/tools/xcs/Makefile | 7
b/tools/xcutils/Makefile | 2
b/tools/xentrace/Makefile | 3
tools/libxutil/Makefile | 76
tools/libxutil/allocate.c | 116 -
tools/libxutil/allocate.h | 45
tools/libxutil/debug.h | 72
tools/libxutil/enum.c | 61
tools/libxutil/enum.h | 30
tools/libxutil/fd_stream.c | 184 -
tools/libxutil/fd_stream.h | 36
tools/libxutil/file_stream.c | 220 --
tools/libxutil/file_stream.h | 35
tools/libxutil/gzip_stream.c | 174 -
tools/libxutil/gzip_stream.h | 30
tools/libxutil/hash_table.c | 640 ------
tools/libxutil/hash_table.h | 294 --
tools/libxutil/iostream.c | 55
tools/libxutil/iostream.h | 269 --
tools/libxutil/kernel_stream.c | 178 -
tools/libxutil/kernel_stream.h | 29
tools/libxutil/lexis.c | 94
tools/libxutil/lexis.h | 128 -
tools/libxutil/socket_stream.c | 230 --
tools/libxutil/socket_stream.h | 53
tools/libxutil/string_stream.c | 162 -
tools/libxutil/string_stream.h | 45
tools/libxutil/sxpr.c | 1230 ------------
tools/libxutil/sxpr.h | 437 ----
tools/libxutil/sxpr_parser.c | 991 ---------
tools/libxutil/sxpr_parser.h | 154 -
tools/libxutil/sys_net.c | 319 ---
tools/libxutil/sys_net.h | 78
tools/libxutil/sys_string.c | 193 -
tools/libxutil/sys_string.h | 92
tools/libxutil/util.c | 106 -
tools/libxutil/util.h | 28
87 files changed, 6912 insertions(+), 6919 deletions(-)
diff -Nru a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile 2005-05-24 18:02:03 -04:00
+++ b/tools/Makefile 2005-05-24 18:02:03 -04:00
@@ -2,7 +2,6 @@
include $(XEN_ROOT)/tools/Rules.mk
SUBDIRS :=
-SUBDIRS += libxutil
SUBDIRS += libxc
SUBDIRS += misc
SUBDIRS += examples
diff -Nru a/tools/Rules.mk b/tools/Rules.mk
--- a/tools/Rules.mk 2005-05-24 18:02:03 -04:00
+++ b/tools/Rules.mk 2005-05-24 18:02:03 -04:00
@@ -4,7 +4,6 @@
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 -Nru a/tools/blktap/Makefile b/tools/blktap/Makefile
--- a/tools/blktap/Makefile 2005-05-24 18:02:02 -04:00
+++ b/tools/blktap/Makefile 2005-05-24 18:02:02 -04:00
@@ -47,7 +47,6 @@
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.$(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 -Nru 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
--- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in 2005-05-24
18:02:03 -04:00
+++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in 2005-05-24
18:02:03 -04:00
@@ -83,7 +83,7 @@
# -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 -Nru a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
--- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2005-05-24
18:02:03 -04:00
+++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2005-05-24
18:02:03 -04:00
@@ -3475,7 +3475,7 @@
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 -Nru 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
--- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in 2005-05-24
18:02:03 -04:00
+++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in 2005-05-24
18:02:03 -04:00
@@ -107,7 +107,7 @@
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 -Nru a/tools/ioemu/target-i386-dm/Makefile
b/tools/ioemu/target-i386-dm/Makefile
--- a/tools/ioemu/target-i386-dm/Makefile 2005-05-24 18:02:03 -04:00
+++ b/tools/ioemu/target-i386-dm/Makefile 2005-05-24 18:02:03 -04:00
@@ -189,7 +189,7 @@
#########################################################
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 -Nru a/tools/libxc/Makefile b/tools/libxc/Makefile
--- a/tools/libxc/Makefile 2005-05-24 18:02:02 -04:00
+++ b/tools/libxc/Makefile 2005-05-24 18:02:02 -04:00
@@ -12,9 +12,6 @@
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 @@
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 -Nru a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h
--- a/tools/libxc/xc_private.h 2005-05-24 18:02:02 -04:00
+++ b/tools/libxc/xc_private.h 2005-05-24 18:02:02 -04:00
@@ -232,8 +232,6 @@
} 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 -Nru a/tools/libxutil/Makefile b/tools/libxutil/Makefile
--- a/tools/libxutil/Makefile 2005-05-24 18:02:03 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,77 +0,0 @@
-
-XEN_ROOT = ../..
-INSTALL = install
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
-
-include $(XEN_ROOT)/tools/Rules.mk
-
-LIB_SRCS :=
-LIB_SRCS += allocate.c
-LIB_SRCS += enum.c
-LIB_SRCS += file_stream.c
-LIB_SRCS += gzip_stream.c
-LIB_SRCS += hash_table.c
-LIB_SRCS += iostream.c
-LIB_SRCS += lexis.c
-LIB_SRCS += string_stream.c
-LIB_SRCS += sxpr.c
-LIB_SRCS += sxpr_parser.c
-LIB_SRCS += sys_net.c
-LIB_SRCS += sys_string.c
-LIB_SRCS += util.c
-
-LIB_OBJS := $(LIB_SRCS:.c=.o)
-PIC_OBJS := $(LIB_SRCS:.c=.opic)
-
-CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
-
-# Get gcc to generate the dependencies for us.
-CFLAGS += -Wp,-MD,.$(@F).d
-DEPS = .*.d
-
-MAJOR := 3.0
-MINOR := 0
-LIB := libxutil.so
-LIB += libxutil.so.$(MAJOR)
-LIB += libxutil.so.$(MAJOR).$(MINOR)
-LIB += libxutil.a
-
-all: build
-build: check-for-zlib
- $(MAKE) $(LIB)
-
-libxutil.so: libxutil.so.$(MAJOR)
- ln -sf $^ $@
-
-libxutil.so.$(MAJOR): libxutil.so.$(MAJOR).$(MINOR)
- ln -sf $^ $@
-
-libxutil.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
- $(CC) $(CFLAGS) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
-
-libxutil.a: $(LIB_OBJS)
- $(AR) rc $@ $^
-
-check-for-zlib:
- @if [ ! -e /usr/include/zlib.h ]; then \
- echo "***********************************************************"; \
- echo "ERROR: install zlib header files (http://www.gzip.org/zlib)"; \
- echo "***********************************************************"; \
- false; \
- fi
-
-install: build
- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) -p
$(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
- ln -sf libxutil.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
- ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so
-
-clean:
- $(RM) *.a *.so* *.o *.opic *.rpm
- $(RM) *~
- $(RM) $(DEPS)
-
--include $(DEPS)
diff -Nru a/tools/libxutil/allocate.c b/tools/libxutil/allocate.c
--- a/tools/libxutil/allocate.c 2005-05-24 18:02:03 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2001 - 2004 Mike Wray <mike.wray@xxxxxx>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "allocate.h"
-
-/** @file
- * Support for allocating memory.
- * Usable from user code or kernel code (with __KERNEL__ defined).
- * In user code will use GC if USE_GC is defined.
- */
-
-#ifdef __KERNEL__
-/*----------------------------------------------------------------------------*/
-# include <linux/config.h>
-# include <linux/slab.h>
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home