Change way we look for xend errors (Kazuki Mizushima )

diff --git a/ChangeLog b/ChangeLog
index 7f07f607e56440c726b7c34878df951f860f84f5..aa597fce111dd3c58462b49a3c88642d08fdbf61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 01 18;22:23 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/xend_internal.c: Instead of looking for string 'Cannot'
+       in POST response, look for 'xend.err' which is likely to catch
+       many more error replies from XenD. Signed-off-by: Kazuki Mizushima
+
 Thu Mar 01 16:17:48 EST 2007 Mark McLoughlin <markmc@redhat.com>
 
        * acinclude.m4: add LIBVIRT_COMPILE_WARNINGS, copied from

diff --git a/src/xend_internal.c b/src/xend_internal.c
index f7288d61f3ae11ea6e67c4c2fc85500b88a78c4f..ec38c49eb1cf05af48161bdea8a25d115c57199b 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -511,10 +511,10 @@ xend_post(virConnectPtr xend, const char *path, const char *ops,
     } else if ((ret == 202) && (strstr(content, "failed") != NULL)) {
         virXendError(xend, VIR_ERR_POST_FAILED, content);
         ret = -1;
-    } else if ((ret == 202) && (strstr(content, "Cannot") != NULL)) {
-        /* This is to catch case of 'virsh dump Domain-0 foo'
-         * which returns a success code, but the word 'Cannot'
-         * in body to indicate error
+    } else if (((ret >= 200) && (ret <= 202)) && (strstr(content, "xend.err") != NULL)) {
+        /* This is to catch case of things like 'virsh dump Domain-0 foo'
+         * which returns a success code, but the word 'xend.err'
+         * in body to indicate error :-(
          */
         virXendError(xend, VIR_ERR_POST_FAILED, content);
         ret = -1;