]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/qemu-xen.git/commitdiff
io: increment counter when killing off subcommand
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 11 Jan 2016 13:00:36 +0000 (13:00 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 19 Jan 2016 14:03:27 +0000 (14:03 +0000)
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>
io/channel-command.c

index 598fdab5a3dd1f97923de706b79b6ca5da9b13db..a220fe886b184be66fe70c58209febe16c2346c7 100644 (file)
@@ -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;
     }