[Xen-changelog] Makefile:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1534, 2005/05/24 21:33:02+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Makefile:
          xc_io.[ch] is no longer needed.
        xc_vmx_build.c:
          offsetof() needs #include <stddef.h>, which was getting pulled in
          implicitly from xc_io.h.
        .del-xc_io.h~f59d36f1439a3f8d:
          Delete: tools/libxc/xc_io.h
        .del-xc_io.c~2d9e23eb479fe52:
          Delete: tools/libxc/xc_io.c
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 b/tools/libxc/Makefile       |    1 
 b/tools/libxc/xc_vmx_build.c |    1 
 tools/libxc/xc_io.c          |   43 --------------------------
 tools/libxc/xc_io.h          |   71 -------------------------------------------
 4 files changed, 1 insertion(+), 115 deletions(-)


diff -Nru a/tools/libxc/Makefile b/tools/libxc/Makefile
--- a/tools/libxc/Makefile      2005-05-24 18:01:44 -04:00
+++ b/tools/libxc/Makefile      2005-05-24 18:01:44 -04:00
@@ -22,7 +22,6 @@
 SRCS     += xc_domain.c
 SRCS     += xc_evtchn.c
 SRCS     += xc_gnttab.c
-SRCS     += xc_io.c
 SRCS     += xc_linux_build.c
 SRCS     += xc_plan9_build.c
 SRCS     += xc_linux_restore.c
diff -Nru a/tools/libxc/xc_io.c b/tools/libxc/xc_io.c
--- a/tools/libxc/xc_io.c       2005-05-24 18:01:44 -04:00
+++ /dev/null   Wed Dec 31 16:00:00 196900
@@ -1,43 +0,0 @@
-#include "xc_io.h"
-#include <sys/time.h>
-
-void xcio_timestamp(XcIOContext *ctxt, const char *msg){
-  struct timeval tv;
-
-  gettimeofday(&tv, NULL);
-  if (msg[0] != '\b' && msg[0] != '\r')
-      fprintf(stdout, "[%08ld.%06ld] ", tv.tv_sec, tv.tv_usec);
-}
-
-void xcio_error(XcIOContext *ctxt, const char *msg, ...){
-  va_list args;
-
-  va_start(args, msg);
-  vfprintf(stdout, msg, args); fprintf(stdout, "\n"); fflush(stdout);
-  IOStream_vprint(ctxt->info, msg, args);
-  IOStream_print(ctxt->info, "\n");
-  va_end(args);
-}
-
-void xcio_info(XcIOContext *ctxt, const char *msg, ...){
-  va_list args;
-
-  if(0 && !(ctxt->flags & XCFLAGS_VERBOSE)) return;
-  va_start(args, msg);
-  xcio_timestamp(ctxt, msg);
-  vfprintf(stdout, msg, args); fprintf(stdout, "\n");
-  IOStream_vprint(ctxt->info, msg, args);
-  fflush(stdout);
-  va_end(args);
-}
-
-void xcio_debug(XcIOContext *ctxt, const char *msg, ...){
-  va_list args;
-
-  if(0 && !(ctxt->flags & XCFLAGS_DEBUG)) return;
-  va_start(args, msg);
-  xcio_timestamp(ctxt, msg);
-  vfprintf(stdout, msg, args); fprintf(stdout, "\n");
-  IOStream_vprint(ctxt->info, msg, args);
-  va_end(args);
-}
diff -Nru a/tools/libxc/xc_io.h b/tools/libxc/xc_io.h
--- a/tools/libxc/xc_io.h       2005-05-24 18:01:44 -04:00
+++ /dev/null   Wed Dec 31 16:00:00 196900
@@ -1,71 +0,0 @@
-#ifndef __XC_XC_IO_H__
-#define __XC_XC_IO_H__
-
-#include <errno.h>
-#include "xc_private.h"
-#include "iostream.h"
-
-typedef struct XcIOContext {
-    u32 domain;
-    unsigned flags;
-    int resource;
-    IOStream *io;
-    IOStream *info;
-    IOStream *err;
-    char *vmconfig;
-    int vmconfig_n;
-    int (*suspend)(void *data, u32 domain);
-    int (*configure)(void *data, u32 domain, char *vmconfig, int vmconfig_n);
-    void *data;
-} XcIOContext;
-
-static inline int xcio_suspend_domain(XcIOContext *ctxt){
-    int err = 0;
-
-    if(ctxt->suspend){
-        err = ctxt->suspend(ctxt->data, ctxt->domain);
-    } else {
-        err = -EINVAL;
-    }
-    return err;
-}
-
-static inline int xcio_configure_domain(XcIOContext *ctxt){
-    int err = 0;
-
-    if(ctxt->configure){
-        err = ctxt->configure(ctxt->data, ctxt->domain, ctxt->vmconfig, 
ctxt->vmconfig_n);
-    } else {
-        err = -EINVAL;
-    }
-    return err;
-}
-
-static inline int xcio_read(XcIOContext *ctxt, void *buf, int n){
-    int rc;
-
-    rc = IOStream_read(ctxt->io, buf, n);
-    return (rc == n ? 0 : -1);
-}
-
-static inline int xcio_write(XcIOContext *ctxt, void *buf, int n){
-    int rc;
-
-    rc = IOStream_write(ctxt->io, buf, n);
-    return (rc == n ? 0 : -1);
-}
-
-static inline int xcio_flush(XcIOContext *ctxt){
-    return IOStream_flush(ctxt->io);
-}
-
-extern void xcio_error(XcIOContext *ctxt, const char *msg, ...);
-extern void xcio_info(XcIOContext *ctxt, const char *msg, ...);
-
-#define xcio_perror(_ctxt, _msg...) \
-xcio_error(_ctxt, "(errno %d %s)" _msg, errno, strerror(errno), ## _msg)
-
-#endif /* ! __XC_XC_IO_H__ */
-
-
-
diff -Nru a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c
--- a/tools/libxc/xc_vmx_build.c        2005-05-24 18:01:44 -04:00
+++ b/tools/libxc/xc_vmx_build.c        2005-05-24 18:01:44 -04:00
@@ -2,6 +2,7 @@
  * xc_vmx_build.c
  */
 
+#include <stddef.h>
 #include "xc_private.h"
 #define ELFSIZE 32
 #include "xc_elf.h"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog