Wed Sep 12 11:30:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

	* src/xend_internal.c, src/xen_unified.c: Removed an annoying
	  warning when using Xen 3.0.3 and inactive domains.

diff --git a/ChangeLog b/ChangeLog
index 2b2d396aa5fd016062f7fc50262c32d513926d12..cbcaaef8b029ca5df58cfc66d73b7c2ade32e502 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 12 11:30:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/xend_internal.c, src/xen_unified.c: Removed an annoying
+         warning when using Xen 3.0.3 and inactive domains.
+
 Wed Sep 12 11:25:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/remote_internal.c: virDrvOpenRemoteFlags was accidentally

diff --git a/src/xen_unified.c b/src/xen_unified.c
index dcf89278724e5a7837c61d9fb2250efcb1bbc6a5..e7b8842e4ced68c4581fdd17ef7bd2542fbed4e4 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -812,6 +812,10 @@ xenUnifiedDomainDumpXML (virDomainPtr dom, int flags)
             if (ret) return ret;
         }
 
+    /* XXX May need to return an error here if sub-drivers didn't
+     * set one.  We really should change these to direct calls to
+     * the sub-drivers at a later date.
+     */
     return NULL;
 }
 

diff --git a/src/xend_internal.c b/src/xend_internal.c
index 64557fcb75d40e09d915d0865a400df0ce44b91d..6bbf18f048c8cd63047b6f51f85689e446ce6715 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -2470,8 +2470,7 @@ xenDaemonDomainDumpXML(virDomainPtr domain, int flags ATTRIBUTE_UNUSED)
     priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
 
     if (domain->id < 0 && priv->xendConfigVersion < 3) {
-        virXendError (domain->conn, VIR_ERR_XEN_CALL,
-                      "xenDaemonDomainDumpXML domain ID < 0 and xendConfigVersion < 3");
+       // fall-through to the next driver to handle
         return(NULL);
     }