* src/xm_internal.c: If vcpu cpuset attribute is invalid

	then display an error instead of silently ignoring it
	(Hiroyuki Kaguchi).

diff --git a/ChangeLog b/ChangeLog
index 6ccfe02e97fa7103c28718392a457a097c9c6e14..491bc56964d81a9af1821ec1ae26b0d452740ee1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun  3 08:58:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/xm_internal.c: If vcpu cpuset attribute is invalid
+       then display an error instead of silently ignoring it
+       (Hiroyuki Kaguchi).
+
 Mon Jun  2 12:52:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
        General tips for contributing patches

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 4c64b7dccabe8457e8e952b78070bfb8dfd20291..bee178052e2d20d338d2f67c50be581c040ba499 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -2004,20 +2004,15 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) {
         char *ranges;
 
         ranges = virConvertCpuSet(conn, cpus, 0);
-        if (ranges != NULL) {
-            VIR_FREE(cpus);
-            if (xenXMConfigSetString(conf, "cpus", ranges) < 0) {
-                VIR_FREE(ranges);
-                goto error;
-            }
+        VIR_FREE(cpus);
+        if (ranges == NULL) {
+            goto error;
+        }
+        if (xenXMConfigSetString(conf, "cpus", ranges) < 0) {
             VIR_FREE(ranges);
-        } else {
-            if (xenXMConfigSetString(conf, "cpus", cpus) < 0) {
-                VIR_FREE(cpus);
-                goto error;
-            }
-            VIR_FREE(cpus);
+            goto error;
         }
+        VIR_FREE(ranges);
     }
 
     obj = xmlXPathEval(BAD_CAST "string(/domain/os/type)", ctxt);