Christian Ehrhardt <christian.ehrhardt(a)canonical.com> [2018-08-14, 11:27AM +0200]:
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index ecea27a2d4..46360cc051 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -341,15 +341,19 @@ int virProcessKill(pid_t pid, int sig)
* Returns 0 if it was killed gracefully, 1 if it
* was killed forcibly, -1 if it is still alive,
* or another error occurred.
+ *
+ * Callers can proide an extra delay to wait longer
+ * than the default.
*/
int
-virProcessKillPainfully(pid_t pid, bool force)
+virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay)
{
size_t i;
int ret = -1;
+ unsigned int delay = 75 + (extradelay*5);
const char *signame = "TERM";
- VIR_DEBUG("vpid=%lld force=%d", (long long)pid, force);
+ VIR_DEBUG("vpid=%lld force=%d delay=%u", (long long)pid, force, pid);
^
This probably should be delay, right?