* src/stats_linux.c: patch from Jim Paris to fix compilation

  when Xen isn't installed
* src/qemu_conf.h: small cleanup of signedness of bitfields
  from Jim Paris
Daniel

diff --git a/ChangeLog b/ChangeLog
index 283b7b3b19b274c8b10eedcfc68dd1af70fd1180..a7b44882585269dc23ff573ad44c6723a08198ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 15 11:54:40 CET 2007 Daniel Veillard <veillard@redhat.com>
+
+       * src/stats_linux.c: patch from Jim Paris to fix compilation
+         when Xen isn't installed
+       * src/qemu_conf.h: small cleanup of signedness of bitfields
+         from Jim Paris
+
 Wed Nov 14 18:09:31 CET 2007 Daniel Veillard <veillard@redhat.com>
 
        * doc/libvir.html doc/format.html: add missing docs for 

diff --git a/src/qemu_conf.h b/src/qemu_conf.h
index 72e582d572c25b0a9edd1832a8c43b43398109a0..6a5974436cee6f0f8d4cdf64bfafd8747914c1c0 100644 (file)
--- a/src/qemu_conf.h
+++ b/src/qemu_conf.h
@@ -305,8 +305,8 @@ struct qemud_driver {
     char *networkConfigDir;
     char *networkAutostartDir;
     char logDir[PATH_MAX];
-    int vncTLS : 1;
-    int vncTLSx509verify : 1;
+    unsigned int vncTLS : 1;
+    unsigned int vncTLSx509verify : 1;
     char *vncTLSx509certdir;
     char vncListen[BR_INET_ADDR_MAXLEN];
 };

diff --git a/src/stats_linux.c b/src/stats_linux.c
index 5e6d06c0504ef0785a39fe097d1e3d42bc731ae9..125af45fcddfff59ed1c04749b5001c683d56ccc 100644 (file)
--- a/src/stats_linux.c
+++ b/src/stats_linux.c
@@ -19,7 +19,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef WITH_XEN
 #include <xs.h>
+#endif
 
 #include "internal.h"
 #include "xen_unified.h"