[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libvir] [PATCH] Remove warning when dumping XML from an inactive domain with Xen < 3.1




# virsh dumpxml solaris32fv
libvir: Xen Daemon error : failed Xen syscall xenDaemonDomainDumpXML domain ID < 0 and xendConfigVersion < 3 0
[ and dump proceeds as normal ]

The patch just removes the false error message and makes a note that this still needs a real fix later.

Rich.

--
Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/
Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod
Street, Windsor, Berkshire, SL4 1TE, United Kingdom.  Registered in
England and Wales under Company Registration No. 03798903
? src/libvirt_la-bridge.loT
Index: src/xen_unified.c
===================================================================
RCS file: /data/cvs/libvirt/src/xen_unified.c,v
retrieving revision 1.20
diff -u -p -r1.20 xen_unified.c
--- src/xen_unified.c	21 Aug 2007 10:08:12 -0000	1.20
+++ src/xen_unified.c	4 Sep 2007 16:23:16 -0000
@@ -812,6 +812,10 @@ xenUnifiedDomainDumpXML (virDomainPtr do
             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;
 }
 
Index: src/xend_internal.c
===================================================================
RCS file: /data/cvs/libvirt/src/xend_internal.c,v
retrieving revision 1.136
diff -u -p -r1.136 xend_internal.c
--- src/xend_internal.c	27 Aug 2007 09:31:31 -0000	1.136
+++ src/xend_internal.c	4 Sep 2007 16:23:18 -0000
@@ -2453,9 +2453,6 @@ xenDaemonDomainDumpXMLByName(virConnectP
  * @domain: a domain object
  *
  * Provide an XML description of the domain.
- *
- * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error.
- *         the caller must free() the returned value.
  */
 char *
 xenDaemonDomainDumpXML(virDomainPtr domain, int flags ATTRIBUTE_UNUSED)
@@ -2470,8 +2467,7 @@ xenDaemonDomainDumpXML(virDomainPtr doma
     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);
     }
 

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]