From: Michael Chapman <mike@very.puzzling.org>
Date: Wed, 27 Jan 2016 02:24:53 +0000 (+1100)
Subject: virsh: ensure SIGINT action is reset on all errors
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8fa216bbb40df33e7fce5d727aa3dc334480878a;p=libvirt.git

virsh: ensure SIGINT action is reset on all errors

If virTimeMillisNow() fails, the SIGINT action must be reset back to
its previous state.

Signed-off-by: Michael Chapman <mike@very.puzzling.org>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index cdeccaced6..750b273baa 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -1857,7 +1857,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data)
 
     if (data->timeout && virTimeMillisNow(&start) < 0) {
         vshSaveLibvirtError();
-        return -1;
+        goto cleanup;
     }
 
     last.cur = last.end = 0;