From 77cf0390e47076ba93a7005738b31f13a56af42a Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Fri, 5 Oct 2007 01:08:17 +0000
Subject: [PATCH] Fix NUMA topology error handling (beth kon)

---
 ChangeLog           |  5 +++++
 src/xend_internal.c | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9dca61a2d9..fcdc1cf257 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  4 21:05:59 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/xend_internal.c: Fix error handling for NUMA topology
+	(patch from Beth Kon)
+
 Wed Oct  3 10:13:59 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* po/id.po: Remove bogus Project-Id-Version field from merge error
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 5b28065df8..47feb2e465 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -2006,15 +2006,15 @@ sexpr_to_xend_topology_xml(virConnectPtr conn, struct sexpr *root, virBufferPtr
                     goto error;
 
                 }
-                for (i=start; i<=finish && nodeCpuCount<numCpus; i++) {
+                for (i=start; i<=finish; i++) {
+                    nodeCpuCount++;
+                    if (nodeCpuCount > numCpus) {
+                        virXendError(conn, VIR_ERR_XEN_CALL, 
+                                     "conflicting cpu counts");
+                        goto error;
+                    }
                     *(cpuIdsPtr++) = i;
                     cellCpuCount++;
-                    nodeCpuCount++;
-                }
-                if (nodeCpuCount > numCpus) {
-                    virXendError(conn, VIR_ERR_XEN_CALL, 
-                                 "conflicting cpu counts");
-                    goto error;
                 }
                 offset += len;
                 next = *(offset);