Fix NUMA topology error handling (beth kon)

This commit is contained in:
Daniel P. Berrange 2007-10-05 01:08:17 +00:00
parent d08b12c1a6
commit 77cf0390e4
2 changed files with 12 additions and 7 deletions

View File

@ -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> 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 * po/id.po: Remove bogus Project-Id-Version field from merge error

View File

@ -2006,15 +2006,15 @@ sexpr_to_xend_topology_xml(virConnectPtr conn, struct sexpr *root, virBufferPtr
goto error; 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; *(cpuIdsPtr++) = i;
cellCpuCount++; cellCpuCount++;
nodeCpuCount++;
}
if (nodeCpuCount > numCpus) {
virXendError(conn, VIR_ERR_XEN_CALL,
"conflicting cpu counts");
goto error;
} }
offset += len; offset += len;
next = *(offset); next = *(offset);