From 5fac0c95e147da319ac67675b600a0566a4074e6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 12 Sep 2007 10:37:00 +0000 Subject: [PATCH] Wed Sep 12 11:30:00 BST 2007 Richard W.M. Jones * src/xend_internal.c, src/xen_unified.c: Removed an annoying warning when using Xen 3.0.3 and inactive domains. --- ChangeLog | 5 +++++ src/xen_unified.c | 4 ++++ src/xend_internal.c | 3 +-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b2d396aa5..cbcaaef8b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 12 11:30:00 BST 2007 Richard W.M. Jones + + * 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 * src/remote_internal.c: virDrvOpenRemoteFlags was accidentally diff --git a/src/xen_unified.c b/src/xen_unified.c index dcf8927872..e7b8842e4c 100644 --- 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 64557fcb75..6bbf18f048 100644 --- 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); }