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 8d3da1cacab947fa72ffeedda2a70653cc346e12..df1757b4ca7dc9ddf4034955a80777243d67fa85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 12 11:37:16 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+       * 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 <agx@sigxcpu.org>
 
        * docs/devhelp/Makefile.am: look for devhelp.xsl in $(srcdir)

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 206fb0baefc1099dbe23c04d6659ec6e0d43cdb1..59171e7fe0bcebaf09e53911f423b5789ea66a55 100644 (file)
--- 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 7eb630dc7794bfb198dff931ba4f93372c1eec22..3659c6bf64d977efcbf51fbbf21d161510ec98f0 100644 (file)
--- 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++)