X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Flibvirt_c_oneoffs.c;h=70cf96f337d6b502b01565084b1e0021b8478d3c;hb=c6c9c3fff5993056e0af7219f4fe67ab8db3cdf2;hp=f827707a77e6478129370fce67e46ae745b9be9a;hpb=c96c3a119b44d3321dddc5e189dcba991aaff677;p=ocaml-libvirt.git

diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c
index f827707..70cf96f 100644
--- a/libvirt/libvirt_c_oneoffs.c
+++ b/libvirt/libvirt_c_oneoffs.c
@@ -532,20 +532,24 @@ extern int virDomainGetCPUStats (virDomainPtr domain,
 #endif
 
 CAMLprim value
-ocaml_libvirt_domain_get_cpu_stats (value domv, value nr_pcpusv)
+ocaml_libvirt_domain_get_cpu_stats (value domv)
 {
 #ifdef HAVE_VIRDOMAINGETCPUSTATS
-  CAMLparam2 (domv, nr_pcpusv);
+  CAMLparam1 (domv);
   CAMLlocal5 (cpustats, param_head, param_node, typed_param, typed_param_value);
   CAMLlocal1 (v);
   virDomainPtr dom = Domain_val (domv);
   virConnectPtr conn = Connect_domv (domv);
-  int nr_pcpus = Int_val (nr_pcpusv);
   virTypedParameterPtr params;
   int r, cpu, ncpus, nparams, i, j, pos;
+  int nr_pcpus;
+
+  /* get number of pcpus */
+  NONBLOCKING (nr_pcpus = virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0));
+  CHECK_ERROR (nr_pcpus < 0, conn, "virDomainGetCPUStats");
 
   /* get percpu information */
-  NONBLOCKING (nparams = virDomainGetCPUStats(dom, NULL, 0, -1, 1, 0));
+  NONBLOCKING (nparams = virDomainGetCPUStats(dom, NULL, 0, 0, 1, 0));
   CHECK_ERROR (nparams < 0, conn, "virDomainGetCPUStats");
 
   if ((params = malloc(sizeof(*params) * nparams * 128)) == NULL)
@@ -568,7 +572,7 @@ ocaml_libvirt_domain_get_cpu_stats (value domv, value nr_pcpusv)
         continue;
       }
 
-      for (j = nparams - 1; j >= 0; j--) {
+      for (j = r - 1; j >= 0; j--) {
         pos = i * nparams + j;
           if (params[pos].type == 0)
             continue;
@@ -613,6 +617,9 @@ ocaml_libvirt_domain_get_cpu_stats (value domv, value nr_pcpusv)
           free (params[pos].value.s);
           break;
         default:
+            /* XXX Memory leak on this path, if there are more
+             * VIR_TYPED_PARAM_STRING past this point in the array.
+             */
           free (params);
           caml_failwith ("virDomainGetCPUStats: "
                          "unknown parameter type returned");