Rename libxc => libxenctl

PATCH In review Anthony Liguori 2 participants 3 messages Aug 22, 2005 – Aug 24, 2005 Arm/actions semi architecture

Share & tools

Anthony Liguori

author

2005-08-22 19:43 UTC #0 lore raw

PATCH 1/1 Rename libxc => libxenctl

I'm breaking the tidying up into parts. The first is renaming libxc => libxenctl. I'd like to rename tools/libxc to tools/libxenctl but I thought it might be worth waiting until "flag day" so that we can avoid losing revision history. Does that seem reasonable?

Rename libxc to libxenctl, xc.h to xenctl.h, and install xenctl.h to /usr/include/xen/xenctl.h

Regards,

Anthony Liguori

# HG changeset patch
# User Anthony Liguori <[email protected]>
# Node ID b6d5ad7d905dac85ed9d503ba8a92c6e932bd00e
# Parent 2052ce3345c1441f96729bc59120b3352a995112
Rename libxc to libxenctl, xc.h to xenctl.h, and install xenctl.h to /usr/include/xen/xenctl.h

Signed-off-by Anthony Liguori <[email protected]>

tools/blktap/blktaplib.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/blktap/blktaplib.h
@@ -7,7 +7,7 @@
 #ifndef __BLKTAPLIB_H__
 #define __BLKTAPLIB_H__
 
-#include <xc.h>
+#include <xenctl.h>
 #include <sys/user.h>
 #include <xen/xen.h>
 #include <xen/io/blkif.h>

tools/blktap/parallax/block-async.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/blktap/parallax/block-async.h
@@ -7,7 +7,7 @@
 #define _BLOCKASYNC_H_
 
 #include <assert.h>
-#include <xc.h>
+#include <xenctl.h>
 #include "vdi.h"
 
 struct io_ret

tools/blktap/parallax/blockstore.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/blktap/parallax/blockstore.h
@@ -10,7 +10,7 @@
 #define __BLOCKSTORE_H__
 
 #include <netinet/in.h>
-#include <xc.h>
+#include <xenctl.h>
 
 #define BLOCK_SIZE  4096
 #define BLOCK_SHIFT   12

tools/console/Makefile +2 -2

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/console/Makefile
@@ -26,11 +26,11 @@
 
 xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
 	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
-              -lxc -lxenstore
+              -lxenctl -lxenstore
 
 xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
 	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
-	      -lxc -lxenstore
+	      -lxenctl -lxenstore
 
 install: $(BIN)
 	$(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR)

tools/console/client/main.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/console/client/main.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <pty.h>
 
-#include "xc.h"
+#include "xenctl.h"
 #include "xs.h"
 
 #define ESCAPE_CHARACTER 0x1d

tools/console/daemon/io.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/console/daemon/io.c
@@ -23,7 +23,7 @@
 #include "utils.h"
 #include "io.h"
 
-#include "xc.h"
+#include "xenctl.h"
 #include "xs.h"
 #include "xen/io/domain_controller.h"
 #include "xcs_proto.h"

tools/console/daemon/main.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/console/daemon/main.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "xc.h"
+#include "xenctl.h"
 #include "xen/io/domain_controller.h"
 #include "xcs_proto.h"

tools/console/daemon/utils.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/console/daemon/utils.c
@@ -33,7 +33,7 @@
 #include <sys/un.h>
 #include <string.h>
 
-#include "xc.h"
+#include "xenctl.h"
 #include "xen/io/domain_controller.h"
 #include "xcs_proto.h"

tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <xc.h>
+#include <xenctl.h>
 #define TRACE_ENTER /* printf("enter %s\n", __FUNCTION__) */
 long (*myptrace)(enum __ptrace_request, pid_t, long, long);
 int (*myxcwait)(int domain, int *status, int options) ;

tools/debugger/libxendebug/Makefile +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/libxendebug/Makefile
@@ -20,7 +20,7 @@
 CFLAGS   += -Wp,-MD,.$(@F).d
 DEPS     = .*.d
 
-LDFLAGS  += -L$(XEN_ROOT)/tools/libxc -lxc
+LDFLAGS  += -L$(XEN_ROOT)/tools/libxc -lxenctl
 
 LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
 PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))

tools/debugger/libxendebug/xendebug.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/libxendebug/xendebug.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/mman.h>
-#include <xc.h>
+#include <xenctl.h>
 #include "list.h"
 
 #if defined(__i386__)

tools/debugger/libxendebug/xendebug.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/libxendebug/xendebug.h
@@ -9,7 +9,7 @@
 #ifndef _XENDEBUG_H_DEFINED
 #define _XENDEBUG_H_DEFINED
 
-#include <xc.h>
+#include <xenctl.h>
 
 int xendebug_attach(int xc_handle,
 		    u32 domid,

tools/debugger/pdb/pdb_caml_domain.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/pdb/pdb_caml_domain.c
@@ -6,7 +6,7 @@
  * PDB's OCaml interface library for debugging domains
  */
 
-#include <xc.h>
+#include <xenctl.h>
 #include <xendebug.h>
 #include <errno.h>
 #include <stdio.h>

tools/debugger/pdb/pdb_caml_evtchn.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/pdb/pdb_caml_evtchn.c
@@ -6,7 +6,7 @@
  * PDB's OCaml interface library for event channels
  */
 
-#include <xc.h>
+#include <xenctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

tools/debugger/pdb/pdb_caml_process.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/pdb/pdb_caml_process.c
@@ -15,7 +15,7 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 
-#include <xc.h>
+#include <xenctl.h>
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
 #include <xen/linux/privcmd.h>

tools/debugger/pdb/pdb_caml_xc.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/pdb/pdb_caml_xc.c
@@ -6,7 +6,7 @@
  * PDB's OCaml interface library for debugging domains
  */
 
-#include <xc.h>
+#include <xenctl.h>
 #include <xendebug.h>
 #include <errno.h>
 #include <stdio.h>

tools/debugger/pdb/pdb_caml_xcs.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/pdb/pdb_caml_xcs.c
@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <xc.h>
+#include <xenctl.h>
 
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>

tools/debugger/pdb/pdb_xen.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/debugger/pdb/pdb_xen.c
@@ -7,7 +7,7 @@
  * PDB interface library for accessing Xen
  */
 
-#include <xc.h>
+#include <xenctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

tools/firmware/acpi/acpi2_0.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/firmware/acpi/acpi2_0.h
@@ -18,7 +18,7 @@
 #ifndef _ACPI_2_0_H_
 #define _ACPI_2_0_H_
 
-#include "xc.h"  // for u8, u16, u32, u64 definition
+#include "xenctl.h"  // for u8, u16, u32, u64 definition
 
 #pragma pack (1)

tools/ioemu/hw/i8254.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/ioemu/hw/i8254.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "vl.h"
-#include "xc.h"
+#include "xenctl.h"
 #include <io/ioreq.h>
 
 //#define DEBUG_PIT

tools/ioemu/hw/i8259.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/ioemu/hw/i8259.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "vl.h"
-#include "xc.h"
+#include "xenctl.h"
 #include <io/ioreq.h>
 
 /* debug PIC */

tools/ioemu/hw/ioapic.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/ioemu/hw/ioapic.h
@@ -26,7 +26,7 @@
 #ifndef __IOAPIC_H
 #define __IOAPIC_H
 
-#include "xc.h"
+#include "xenctl.h"
 #include <io/ioreq.h>
 #include <io/vmx_vlapic.h>

tools/ioemu/target-i386-dm/Makefile +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/ioemu/target-i386-dm/Makefile
@@ -188,7 +188,7 @@
 #########################################################
 
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DAPIC_SUPPORT
-LIBS+=-lm -L../../libxc -lxc
+LIBS+=-lm -L../../libxc -lxenctl
 ifndef CONFIG_USER_ONLY
 LIBS+=-lz
 endif

tools/ioemu/target-i386-dm/helper2.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/ioemu/target-i386-dm/helper2.c
@@ -47,7 +47,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "xc.h"
+#include "xenctl.h"
 #include <io/ioreq.h>
 
 #include "cpu.h"

tools/ioemu/vl.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/ioemu/vl.c
@@ -72,7 +72,7 @@
 #endif
 #endif /* CONFIG_SDL */
 
-#include "xc.h"
+#include "xenctl.h"
 #include "exec-all.h"
 
 //#define DO_TB_FLUSH

tools/libxc/Makefile +13 ~~-13~~

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/libxc/Makefile
@@ -48,8 +48,8 @@
 LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
 PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
 
-LIB      := libxc.a libxc-pic.a
-LIB      += libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
+LIB      := libxenctl.a libxenctl-pic.a
+LIB      += libxenctl.so libxenctl.so.$(MAJOR) libxenctl.so.$(MAJOR).$(MINOR)
 
 all: build
 build: check-for-zlib mk-symlinks

@@ -77,11 +77,11 @@
 install: build
 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_DATA) libxc.a $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so.$(MAJOR)
-	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so
-	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
+	$(INSTALL_PROG) libxenctl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DATA) libxenctl.a $(DESTDIR)/usr/$(LIBDIR)
+	ln -sf libxenctl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctl.so.$(MAJOR)
+	ln -sf libxenctl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctl.so
+	$(INSTALL_DATA) xenctl.h $(DESTDIR)/usr/include/xen
 
 .PHONY: TAGS clean rpm install all

@@ -100,18 +100,18 @@
 	mv staging/i386/*.rpm .
 	rm -rf staging
 
-libxc.a: $(LIB_OBJS)
+libxenctl.a: $(LIB_OBJS)
 	$(AR) rc $@ $^
 
-libxc-pic.a: $(PIC_OBJS)
+libxenctl-pic.a: $(PIC_OBJS)
 	$(AR) rc $@ $^
 
-libxc.so: libxc.so.$(MAJOR)
+libxenctl.so: libxenctl.so.$(MAJOR)
 	ln -sf $< $@
-libxc.so.$(MAJOR): libxc.so.$(MAJOR).$(MINOR)
+libxenctl.so.$(MAJOR): libxenctl.so.$(MAJOR).$(MINOR)
 	ln -sf $< $@
 
-libxc.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -lz
+libxenctl.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctl.so.$(MAJOR) -shared -o $@ $^ -lz
 
 -include $(DEPS)

tools/libxc/xc_private.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/libxc/xc_private.h
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "xc.h"
+#include "xenctl.h"
 
 #include <xen/linux/privcmd.h>

tools/misc/Makefile +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/misc/Makefile
@@ -50,4 +50,4 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(TARGETS): %: %.o Makefile
-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc
+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctl

tools/misc/cpuperf/Makefile +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/misc/cpuperf/Makefile
@@ -37,7 +37,7 @@
 	$(CC) $(CFLAGS) -o $@ $<
 
 cpuperf-xen: cpuperf.c $(HDRS) Makefile
-	$(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxc -DXENO -o $@ $<
+	$(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxenctl -DXENO -o $@ $<
 
 cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
 	$(CC) $(CFLAGS) -DPERFCNTR -o $@ $<

tools/misc/cpuperf/cpuperf_xeno.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/misc/cpuperf/cpuperf_xeno.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include <xc.h>
+#include <xenctl.h>
 
 static int xc_handle;

tools/misc/xc_shadow.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/misc/xc_shadow.c
@@ -11,7 +11,7 @@
  */
 
 
-#include <xc.h>
+#include <xenctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>

tools/misc/xenperf.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/misc/xenperf.c
@@ -11,7 +11,7 @@
  */
 
 
-#include <xc.h>
+#include <xenctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>

tools/python/setup.py +2 -2

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/python/setup.py
@@ -17,7 +17,7 @@
                  XEN_ROOT + "/tools/xenstore",
                  ]
 
-libraries = [ "xc", "xenstore" ]
+libraries = [ "xenctl", "xenstore" ]
 
 xc = Extension("xc",
                extra_compile_args = extra_compile_args,

@@ -41,7 +41,7 @@
                sources            = [ "xen/lowlevel/xs/xs.c" ])
 
 setup(name            = 'xen',
-      version         = '2.0',
+      version         = '3.0',
       description     = 'Xen',
       packages        = ['xen',
                          'xen.lowlevel',

tools/python/xen/lowlevel/xc/xc.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/python/xen/lowlevel/xc/xc.c
@@ -5,7 +5,7 @@
  */
 
 #include <Python.h>
-#include <xc.h>
+#include <xenctl.h>
 #include <zlib.h>
 #include <fcntl.h>
 #include <netinet/in.h>

tools/python/xen/lowlevel/xu/xu.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/python/xen/lowlevel/xu/xu.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <signal.h>
-#include <xc.h>
+#include <xenctl.h>
 
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>

tools/xcs/Makefile +2 -2

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xcs/Makefile
@@ -34,10 +34,10 @@
 
 xcsdump: xcsdump.c dump.c
 	$(CC) $(CFLAGS) -o xcsdump xcsdump.c -L$(XEN_LIBXC) \
-              ctrl_interface.c evtchn.c dump.c -lxc
+              ctrl_interface.c evtchn.c dump.c -lxenctl
 
 $(BIN): $(OBJS)
-	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -lxc 
+	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -lxenctl 
 
 $(OBJS): $(HDRS)

tools/xcs/dump.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xcs/dump.h
@@ -20,7 +20,7 @@
 #define XENCTLD_ERROR_H
 
 #include <stdint.h>
-#include <xc.h>
+#include <xenctl.h>
 #include <xen/io/domain_controller.h>
 
 void dump_msg(const control_msg_t *msg, uint64_t flags);

tools/xcs/xcs.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xcs/xcs.h
@@ -11,7 +11,7 @@
 #define __XCS_H__
 
 #include <pthread.h>
-#include <xc.h>
+#include <xenctl.h>
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
 #include <xen/linux/privcmd.h>

tools/xcs/xcsdump.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xcs/xcsdump.c
@@ -16,7 +16,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <ctype.h>
-#include <xc.h>
+#include <xenctl.h>
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
 #include <getopt.h>

tools/xcutils/Makefile +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xcutils/Makefile
@@ -30,7 +30,7 @@
 
 PROGRAMS		= xc_restore xc_save
 
-LDLIBS			= -L$(XEN_LIBXC) -lxc
+LDLIBS			= -L$(XEN_LIBXC) -lxenctl
 
 .PHONY: all
 all: build

tools/xcutils/xc_restore.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xcutils/xc_restore.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <err.h>
 
-#include <xc.h>
+#include <xenctl.h>
 
 int
 main(int argc, char **argv)

tools/xcutils/xc_save.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xcutils/xc_save.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <err.h>
 
-#include <xc.h>
+#include <xenctl.h>
 
 int
 main(int argc, char **argv)

tools/xenstore/Makefile +2 -2

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xenstore/Makefile
@@ -32,7 +32,7 @@
 	ln -sf $(XEN_ROOT)/xen/include/public $@
 
 xenstored: xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xs_lib.o talloc.o utils.o
-	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxc -o $@
+	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctl -o $@
 
 xenstored_test: xenstored_core_test.o xenstored_watch_test.o xenstored_domain_test.o xenstored_transaction_test.o xs_lib.o talloc_test.o fake_libxc.o utils.o
 	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@

@@ -103,7 +103,7 @@
 	export $(TESTENV); PID=`./xenstored_test --output-pid --trace-file=/tmp/trace`; ./xs_stress 5000; ret=$$?; kill $$PID; exit $$ret
 
 xs_dom0_test: xs_dom0_test.o utils.o
-	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxc -o $@
+	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctl -o $@
 
 TAGS:
 	etags `find . -name '*.[ch]'`

tools/xenstore/xs_dom0_test.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xenstore/xs_dom0_test.c
@@ -3,7 +3,7 @@
 #include <sys/ioctl.h>
 #include "xs.h"
 #include "utils.h"
-#include <xc.h>
+#include <xenctl.h>
 #include <xen/linux/privcmd.h>
 #include <stdio.h>
 #include <unistd.h>

tools/xenstore/xs_lib.h +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xenstore/xs_lib.h
@@ -22,7 +22,7 @@
 
 #include <stdbool.h>
 #include <limits.h>
-#include <xc.h>
+#include <xenctl.h>
 
 /* Bitmask of permissions. */
 enum xs_perm_type {

tools/xentrace/Makefile +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xentrace/Makefile
@@ -36,4 +36,4 @@
 	$(RM) *.a *.so *.o *.rpm $(BIN)
 
 %: %.c $(HDRS) Makefile
-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc
+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctl

tools/xentrace/xenctx.c +1 -1

diff -r 2052ce3345c1 -r b6d5ad7d905d tools/xentrace/xenctx.c
@@ -21,7 +21,7 @@
 #include <argp.h>
 #include <signal.h>
 
-#include "xc.h"
+#include "xenctl.h"
 
 #ifdef __i386__
 void print_ctx(vcpu_guest_context_t *ctx1)

tools/libxc/xenctl.h new file +558 -0

558 lines not on this page · raw message

tools/libxc/xc.h deleted +0 ~~-558~~

558 lines not on this page · raw message

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Christian Limpach

2005-08-24 09:30 UTC #1 lore raw

Quoted 4 lines · Anthony Liguori

I'm breaking the tidying up into parts. The first is renaming libxc => libxenctl. I'd like to rename tools/libxc to tools/libxenctl but I thought it might be worth waiting until "flag day" so that we can avoid losing revision history. Does that seem reasonable?

Yes, sounds good! Could you also split out build/save/restore into a seperate library, maybe called libxenguest?

What "flag day"?

Quoted 2 lines

Rename libxc to libxenctl, xc.h to xenctl.h, and install xenctl.h to /usr/include/xen/xenctl.h

Looking at my keyboard, isn't ctrl a more common abbreviation for control? ;-)

christian

Anthony Liguori

author

2005-08-24 13:31 UTC #2 lore raw

Quoted 10 lines · Christian Limpach

Quoted 6 lines · Anthony Liguori
I'm breaking the tidying up into parts. The first is renaming libxc => libxenctl. I'd like to rename tools/libxc to tools/libxenctl but I thought it might be worth waiting until "flag day" so that we can avoid losing revision history. Does that seem reasonable?

Quoted 4 lines

Yes, sounds good! Could you also split out build/save/restore into a seperate library, maybe called libxenguest?

Sure, I'll resubmit this afternoon.

Quoted 3 lines

What "flag day"?

I stole that term from Ian :-) At OLS, Ian mentioned that when mercurial gets rename support, the bk repository is going to be reimported so there's proper revision history.

Quoted 8 lines

Quoted 4 lines
Rename libxc to libxenctl, xc.h to xenctl.h, and install xenctl.h to /usr/include/xen/xenctl.h
Looking at my keyboard, isn't ctrl a more common abbreviation for control? ;-)

Yeah, it is, I'll fold that in too.

Regards,

Anthony Liguori

Quoted 4 lines

christian