[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 2/5] io: increment counter when killing off subcom
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 2/5] io: increment counter when killing off subcommand |
Date: |
Wed, 20 Jan 2016 12:01:30 +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 <address@hidden>
---
io/channel-command.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/io/channel-command.c b/io/channel-command.c
index 598fdab..a220fe8 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;
}
--
2.5.0
- [Qemu-devel] [PULL v1 0/5] I/O channels fixes, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PULL v1 1/5] io: fix sign of errno value passed to error report, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PULL v1 3/5] io: some fixes to handling of /dev/null when running commands, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PULL v1 5/5] io: use memset instead of { 0 } for initializing array, Daniel P. Berrange, 2016/01/20
- [Qemu-devel] [PULL v1 2/5] io: increment counter when killing off subcommand,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 4/5] io: fix description of @errp parameter initialization, Daniel P. Berrange, 2016/01/20
- Re: [Qemu-devel] [PULL v1 0/5] I/O channels fixes, Peter Maydell, 2016/01/21