From 3ad8a273b5624c4f0bc7a01d3e098d67dbb7ea97 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 1 Apr 2009 10:01:23 +0000
Subject: [PATCH] Improve error reporting in Xen driver SEXPR generation

---
 ChangeLog           | 7 +++++++
 src/xend_internal.c | 7 +++----
 src/xm_internal.c   | 5 +----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6c481547b..50dd61e8d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr  1 10:58:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	Improve error reporting in SEXPR generation
+	* src/xm_internal.c, src/xend_internal.c: Avoid overwriting
+	previously set error message. Clarify message when network
+	lookup fails
+
 Wed Apr  1 10:55:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/node_device.c: Fix error message for missing node device
diff --git a/src/xend_internal.c b/src/xend_internal.c
index cc2e803d78..35918fda10 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -3850,8 +3850,6 @@ xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
         return (NULL);
 
     if (!(sexpr = xenDaemonFormatSxpr(conn, def, priv->xendConfigVersion))) {
-        virXendError(conn, VIR_ERR_XML_ERROR,
-                     "%s", _("failed to build sexpr"));
         virDomainDefFree(def);
         return (NULL);
     }
@@ -5214,7 +5212,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
         char *bridge;
 
         if (!network) {
-            virXendError(conn, VIR_ERR_NO_SOURCE, "%s",
+            virXendError(conn, VIR_ERR_NO_NETWORK, "%s",
                          def->data.network.name);
             return -1;
         }
@@ -5222,7 +5220,8 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
         bridge = virNetworkGetBridgeName(network);
         virNetworkFree(network);
         if (!bridge) {
-            virXendError(conn, VIR_ERR_NO_SOURCE, "%s",
+            virXendError(conn, VIR_ERR_INTERNAL_ERROR,
+                         _("network %s is not active"),
                          def->data.network.name);
             return -1;
         }
diff --git a/src/xm_internal.c b/src/xm_internal.c
index 5456a8d59d..0201c4e3ae 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -1734,11 +1734,8 @@ int xenXMDomainCreate(virDomainPtr domain) {
     if (!(entry = virHashLookup(priv->configCache, filename)))
         goto error;
 
-    if (!(sexpr = xenDaemonFormatSxpr(domain->conn, entry->def, priv->xendConfigVersion))) {
-        xenXMError(domain->conn, VIR_ERR_XML_ERROR,
-                   "%s", _("failed to build sexpr"));
+    if (!(sexpr = xenDaemonFormatSxpr(domain->conn, entry->def, priv->xendConfigVersion)))
         goto error;
-    }
 
     ret = xenDaemonDomainCreateXML(domain->conn, sexpr);
     VIR_FREE(sexpr);