提交 84912e9c 编写于 作者: D Daniel P. Berrange

Fix virProcessKillPainfully on Win32

Win32 platforms don't have SIGKILL defined, but they do have
SIGABRT. Since our virProcess wrapper treats anything which
isn't SIGTERM/SIGINT as equivalent to SIGKILL, just use
SIGABRT on Win32.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 381a339e
...@@ -267,8 +267,15 @@ virProcessKillPainfully(pid_t pid, bool force) ...@@ -267,8 +267,15 @@ virProcessKillPainfully(pid_t pid, bool force)
} else if ((i == 50) & force) { } else if ((i == 50) & force) {
VIR_DEBUG("Timed out waiting after SIGTERM to process %d, " VIR_DEBUG("Timed out waiting after SIGTERM to process %d, "
"sending SIGKILL", pid); "sending SIGKILL", pid);
/* No SIGKILL kill on Win32 ! Use SIGABRT instead which our
* virProcessKill proc will handle more or less lik SIGKILL */
#ifdef WIN32
signum = SIGABRT; /* kill it after a grace period */
signame = "ABRT";
#else
signum = SIGKILL; /* kill it after a grace period */ signum = SIGKILL; /* kill it after a grace period */
signame = "KILL"; signame = "KILL";
#endif
} else { } else {
signum = 0; /* Just check for existence */ signum = 0; /* Just check for existence */
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册