From: Daniel Veillard Date: Fri, 12 Dec 2008 10:39:19 +0000 (+0000) Subject: fix bits/bytes memory request mismatches X-Git-Tag: LIBVIRT_0_6_0~238 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e59a005fded159aa7a89e9bca317c6e5986593a;p=thirdparty%2Flibvirt.git fix bits/bytes memory request mismatches * src/qemu_conf.c src/uml_conf.c: fix a couple of places where we were requesting 8 times the required amount of memory, patch by Dave Allan daniel --- diff --git a/ChangeLog b/ChangeLog index 8d3da1caca..df1757b4ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 12 11:37:16 CET 2008 Daniel Veillard + + * src/qemu_conf.c src/uml_conf.c: fix a couple of places where + we were requesting 8 times the required amount of memory, + patch by Dave Allan + Fri Dec 12 10:45:17 CET 2008 Guido Günther * docs/devhelp/Makefile.am: look for devhelp.xsl in $(srcdir) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 206fb0baef..59171e7fe0 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -324,7 +324,7 @@ qemudCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) diff --git a/src/uml_conf.c b/src/uml_conf.c index 7eb630dc77..3659c6bf64 100644 --- a/src/uml_conf.c +++ b/src/uml_conf.c @@ -80,7 +80,7 @@ umlCapsInitNUMA(virCapsPtr caps) for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN / 8) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++)