From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 11 Jan 2016 13:00:36 +0000 (+0000)
Subject: io: increment counter when killing off subcommand
X-Git-Tag: v2.6.0-rc0~212^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c0a55b229bb6d61408394766bcbb04beecd5fa5;p=thirdparty%2Fqemu.git

io: increment counter when killing off subcommand

When killing the subcommand, it is intended to first send
SIGTERM, then SIGKILL and only report an error if it still
doesn't die after SIGKILL. The 'step' counter was not
being incremented though, so the code never got past the
SIGTERM stage.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/io/channel-command.c b/io/channel-command.c
index 598fdab5a3d..a220fe886b1 100644
--- a/io/channel-command.c
+++ b/io/channel-command.c
@@ -179,6 +179,7 @@ static int qio_channel_command_abort(QIOChannelCommand *ioc,
                        (unsigned long long)ioc->pid);
             return -1;
         }
+        step++;
         usleep(10 * 1000);
         goto rewait;
     }