Improve error reporting in Xen driver SEXPR generation

diff --git a/ChangeLog b/ChangeLog
index f6c481547bbc240a08247af99129680a0bb0611b..50dd61e8d9f2b636365f9198ce498d6edbeff376 100644 (file)
--- 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 cc2e803d7872c48e8922bed3036b08d4b8c14ac1..35918fda10afb2b369b50a747a6e7119f93eb8ca 100644 (file)
--- 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 5456a8d59d75f801faae8c62a9c237436cd775f5..0201c4e3ae2676f09c7316757dacabecfc4cf069 100644 (file)
--- 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);