提交 ffbf1df4 编写于 作者: D Daniel P. Berrange 提交者: Eric Blake

Rename virKillProcess to virProcessKill

Changing naming to follow the convention of "object" followed
by "action"
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
(cherry picked from commit cf470068)
上级 1bcb4c72
...@@ -224,7 +224,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) ...@@ -224,7 +224,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
break; break;
if ((errno == ENOENT || errno == ECONNREFUSED) && if ((errno == ENOENT || errno == ECONNREFUSED) &&
virKillProcess(cpid, 0) == 0) { virProcessKill(cpid, 0) == 0) {
/* ENOENT : Socket may not have shown up yet /* ENOENT : Socket may not have shown up yet
* ECONNREFUSED : Leftover socket hasn't been removed yet */ * ECONNREFUSED : Leftover socket hasn't been removed yet */
continue; continue;
......
...@@ -294,7 +294,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) ...@@ -294,7 +294,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
break; break;
if ((errno == ENOENT || errno == ECONNREFUSED) && if ((errno == ENOENT || errno == ECONNREFUSED) &&
virKillProcess(cpid, 0) == 0) { virProcessKill(cpid, 0) == 0) {
/* ENOENT : Socket may not have shown up yet /* ENOENT : Socket may not have shown up yet
* ECONNREFUSED : Leftover socket hasn't been removed yet */ * ECONNREFUSED : Leftover socket hasn't been removed yet */
continue; continue;
......
...@@ -3817,7 +3817,7 @@ qemuProcessKill(struct qemud_driver *driver, ...@@ -3817,7 +3817,7 @@ qemuProcessKill(struct qemud_driver *driver,
signum = 0; /* Just check for existence */ signum = 0; /* Just check for existence */
} }
if (virKillProcess(vm->pid, signum) < 0) { if (virProcessKill(vm->pid, signum) < 0) {
if (errno != ESRCH) { if (errno != ESRCH) {
char ebuf[1024]; char ebuf[1024];
VIR_WARN("Failed to terminate process %d with SIG%s: %s", VIR_WARN("Failed to terminate process %d with SIG%s: %s",
......
...@@ -1101,7 +1101,7 @@ static void umlShutdownVMDaemon(struct uml_driver *driver, ...@@ -1101,7 +1101,7 @@ static void umlShutdownVMDaemon(struct uml_driver *driver,
if (!virDomainObjIsActive(vm)) if (!virDomainObjIsActive(vm))
return; return;
virKillProcess(vm->pid, SIGTERM); virProcessKill(vm->pid, SIGTERM);
VIR_FORCE_CLOSE(priv->monitor); VIR_FORCE_CLOSE(priv->monitor);
......
...@@ -2133,7 +2133,7 @@ check_and_return: ...@@ -2133,7 +2133,7 @@ check_and_return:
} }
/* send signal to a single process */ /* send signal to a single process */
int virKillProcess(pid_t pid, int sig) int virProcessKill(pid_t pid, int sig)
{ {
if (pid <= 1) { if (pid <= 1) {
errno = ESRCH; errno = ESRCH;
......
...@@ -225,7 +225,7 @@ static inline int getgid (void) { return 0; } ...@@ -225,7 +225,7 @@ static inline int getgid (void) { return 0; }
char *virGetHostname(virConnectPtr conn); char *virGetHostname(virConnectPtr conn);
int virKillProcess(pid_t pid, int sig); int virProcessKill(pid_t pid, int sig);
char *virGetUserDirectory(uid_t uid); char *virGetUserDirectory(uid_t uid);
char *virGetUserName(uid_t uid); char *virGetUserName(uid_t uid);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册