From a4499a22c52c1c4159262fca6de9680a8c39ad69 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 15 Nov 2007 10:56:24 +0000
Subject: [PATCH] * 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

---
 ChangeLog         | 7 +++++++
 src/qemu_conf.h   | 4 ++--
 src/stats_linux.c | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 283b7b3b19..a7b4488258 100644
--- 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 72e582d572..6a5974436c 100644
--- 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 5e6d06c050..125af45fcd 100644
--- 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"