]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virsh: do timing even for unusable connections
authorJán Tomko <jtomko@redhat.com>
Thu, 29 Nov 2012 10:46:00 +0000 (11:46 +0100)
committerCole Robinson <crobinso@redhat.com>
Sun, 9 Dec 2012 21:53:40 +0000 (16:53 -0500)
Time values were uninitialized if the connection wasn't usable.
(cherry picked from commit 8b235d40576d5b5077a4ab2ee52a1897211f5e4d)

tools/virsh.c

index b32ee8b232f0f204cb7363d3989018d54ca410cc..215dffa59a655c392efe4276dc1318a9e3755f10 100644 (file)
@@ -1549,20 +1549,20 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd)
             !(cmd->def->flags & VSH_CMD_FLAG_NOCONNECT))
             vshReconnect(ctl);
 
+        if (enable_timing)
+            GETTIMEOFDAY(&before);
+
         if ((cmd->def->flags & VSH_CMD_FLAG_NOCONNECT) ||
             vshConnectionUsability(ctl, ctl->conn)) {
-            if (enable_timing)
-                GETTIMEOFDAY(&before);
-
             ret = cmd->def->handler(ctl, cmd);
-
-            if (enable_timing)
-                GETTIMEOFDAY(&after);
         } else {
             /* connection is not usable, return error */
             ret = false;
         }
 
+        if (enable_timing)
+            GETTIMEOFDAY(&after);
+
         /* try to automatically catch disconnections */
         if (!ret &&
             ((last_error != NULL) &&