From: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Date: Fri, 13 Jul 2012 07:50:25 +0000 (+0200)
Subject: virsh: remove unnecessary sleep for nodecpustats --percent
X-Git-Tag: CVE-2012-3445~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ece765959aaf56261328a4a47ecd8b01150a3d94;p=thirdparty%2Flibvirt.git

virsh: remove unnecessary sleep for nodecpustats --percent

Fix for a minor issue:
the sleep(1) statement was called twice,
effectively doubling the elapsed time
execution "virsh nodecpustats --percent".

Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 126aa3b273..f9fe4b1e7b 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -6840,8 +6840,10 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd)
     memset(cpu_stats, 0, sizeof(cpu_stats));
     params = vshCalloc(ctl, nparams, sizeof(*params));
 
-    i = 0;
-    do {
+    for (i = 0; i < 2; i++) {
+        if (i > 0)
+            sleep(1);
+
         if (virNodeGetCPUStats(ctl->conn, cpuNum, params, &nparams, 0) != 0) {
             vshError(ctl, "%s", _("Unable to get node cpu stats"));
             goto cleanup;
@@ -6866,10 +6868,7 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd)
 
         if (flag_utilization || !flag_percent)
             break;
-
-        i++;
-        sleep(1);
-    } while (i < 2);
+    }
 
     if (!flag_percent) {
         if (!flag_utilization) {