Re: [libvirt] [PATCH v3 3/4] virsh: ensure SIGINT action is reset on all errors

2016-02-01 Thread Peter Krempa 
On Wed, Jan 27, 2016 at 13:24:53 +1100, Michael Chapman wrote:
> If virTimeMillisNow() fails, the SIGINT action must be reset back to
> its previous state.
> 
> Signed-off-by: Michael Chapman 
> ---
>  tools/virsh-domain.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ACK


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v3 3/4] virsh: ensure SIGINT action is reset on all errors

2016-01-26 Thread Michael Chapman 
If virTimeMillisNow() fails, the SIGINT action must be reset back to
its previous state.

Signed-off-by: Michael Chapman 
---
 tools/virsh-domain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index cdeccac..750b273 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;
-- 
2.4.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list