From 3a8d93ab367a67075b01b38daf0196d01ec85376 Mon Sep 17 00:00:00 2001
From: John Levon <john.levon@sun.com>
Date: Thu, 29 Jan 2009 18:40:32 +0000
Subject: [PATCH] Fix xend XML generation when CPU pinning is used

---
 ChangeLog           |  5 +++++
 src/xend_internal.c | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b85d35a854..c6b7696f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 29 17:22:53 GMT 2009 John Levon <john.levon@sun.com>
+
+	* src/xend_internal.c: Fix xend XML generation when CPU pinning
+	is used
+
 Thu Jan 29 19:05:00 +0100 2009 Jim Meyering <meyering@redhat.com>
 
 	maint: sync from coreutils
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 46b4382bea..a47214663a 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -2226,11 +2226,21 @@ xenDaemonParseSxpr(virConnectPtr conn,
         def->maxmem = def->memory;
 
     if (cpus != NULL) {
+        def->cpumasklen = VIR_DOMAIN_CPUMASK_LEN;
+        if (VIR_ALLOC_N(def->cpumask, def->cpumasklen) < 0) {
+            virReportOOMError(conn);
+            goto error;
+        }
+
         if (virDomainCpuSetParse(conn, &cpus,
                                  0, def->cpumask,
-                                 def->cpumasklen) < 0)
+                                 def->cpumasklen) < 0) {
+            virXendError(conn, VIR_ERR_INTERNAL_ERROR,
+                         _("invalid CPU mask %s"), cpus);
             goto error;
+        }
     }
+
     def->vcpus = sexpr_int(root, "domain/vcpus");
 
     tmp = sexpr_node(root, "domain/on_poweroff");