openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

* src/nodeinfo.c: sometimes libnuma can't handle some topologies, 

but those failures should not completely break libvirt, patch
  by Dan Berrange, fixes #506590
daniel
This commit is contained in:
Daniel Veillard 2009-06-26 20:08:07 +00:00
parent 14435163a0
commit ecd937164f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Jun 26 22:02:22 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/nodeinfo.c: sometimes libnuma can't handle some topologies,
but those failures should not completely break libvirt, patch
by Dan Berrange, fixes #506590
Fri Jun 26 20:11:38 CEST 2009 Daniel Veillard <veillard@redhat.com> Fri Jun 26 20:11:38 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/xend_internal.c: avoid a segfault when dumping XML with recent * src/xend_internal.c: avoid a segfault when dumping XML with recent

8
src/nodeinfo.c
View File

@ -43,6 +43,7 @@
#include "nodeinfo.h" #include "nodeinfo.h"
#include "physmem.h" #include "physmem.h"
#include "util.h" #include "util.h"
#include "logging.h"
#include "virterror_internal.h" #include "virterror_internal.h"
@ -206,8 +207,11 @@ nodeCapsInitNUMA(virCapsPtr caps)
for (n = 0 ; n <= numa_max_node() ; n++) { for (n = 0 ; n <= numa_max_node() ; n++) {
int i; int i;
int ncpus; int ncpus;
if (numa_node_to_cpus(n, mask, mask_n_bytes) < 0) if (numa_node_to_cpus(n, mask, mask_n_bytes) < 0) {
goto cleanup; VIR_WARN("NUMA topology for cell %d of %d not available, ignoring",
n, numa_max_node());
continue;
}
for (ncpus = 0, i = 0 ; i < max_n_cpus ; i++) for (ncpus = 0, i = 0 ; i < max_n_cpus ; i++)
if (MASK_CPU_ISSET(mask, i)) if (MASK_CPU_ISSET(mask, i))