diff --git a/ChangeLog b/ChangeLog
index 7d3eb7500c..a137bad26f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 16 15:55:01 CET 2007 Daniel Veillard <veillard@redhat.com>
+
+	* src/xml.c tests/sexpr2xmltest.c tests/xmconfigtest.c: avoid
+	  warnings when compiling without Xen
+
 Fri Mar 16 11:43:08 CET 2007 Daniel Veillard <veillard@redhat.com>
 
 	* python/generator.py: patch from Tatsuro Enokura to fix 
diff --git a/src/xml.c b/src/xml.c
index 09034d418a..e3c4f165d4 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1384,6 +1384,10 @@ virDomainXMLDevID(virDomainPtr domain, char *xmldesc, char *class, char *ref)
                 free(xref);
                 goto cleanup;
             }
+#else /* without xen */
+            /* hack to avoid the warning that domain is unused */
+            if (domain->id < 0)
+	        ret = -1;
 #endif /* WITH_XEN */
 
             goto error;
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 236ebd13a8..80403bddf5 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -196,7 +196,7 @@ int
 main(void)
 {
     fprintf(stderr, "libvirt compiled without Xen support\n");
-    exit(0);
+    return(0);
 }
 #endif /* WITH_XEN */
 /*
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index e5ef2b3cc1..90b432d960 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -220,7 +220,7 @@ int
 main(void)
 {
     fprintf(stderr, "libvirt compiled without Xen support\n");
-    exit(0);
+    return(0);
 }
 #endif /* WITH_XEN */