External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 21:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename virKillProcess to virProcessKill

Browse Source 
Changing naming to follow the convention of "object" followed
by "action"

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit cf470068a114fc7aab5e5de37d3f4fe3545bdc81)
This commit is contained in:
Daniel P. Berrange 2013-09-12 17:00:00 +01:00 committed by Eric Blake
parent 1bcb4c727f
commit ffbf1df457
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_agent.c
View File

@ -224,7 +224,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
break;
if ((errno == ENOENT || errno == ECONNREFUSED) &&
virKillProcess(cpid, 0) == 0) {
virProcessKill(cpid, 0) == 0) {
/* ENOENT : Socket may not have shown up yet
* ECONNREFUSED : Leftover socket hasn't been removed yet */
continue;

2
src/qemu/qemu_monitor.c
View File

@ -294,7 +294,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
break;
if ((errno == ENOENT || errno == ECONNREFUSED) &&
virKillProcess(cpid, 0) == 0) {
virProcessKill(cpid, 0) == 0) {
/* ENOENT : Socket may not have shown up yet
* ECONNREFUSED : Leftover socket hasn't been removed yet */
continue;

2
src/qemu/qemu_process.c
View File

@ -3817,7 +3817,7 @@ qemuProcessKill(struct qemud_driver *driver,
signum = 0; /* Just check for existence */
}
if (virKillProcess(vm->pid, signum) < 0) {
if (virProcessKill(vm->pid, signum) < 0) {
if (errno != ESRCH) {
char ebuf[1024];
VIR_WARN("Failed to terminate process %d with SIG%s: %s",

2
src/uml/uml_driver.c
View File

@ -1101,7 +1101,7 @@ static void umlShutdownVMDaemon(struct uml_driver *driver,
if (!virDomainObjIsActive(vm))
return;
virKillProcess(vm->pid, SIGTERM);
virProcessKill(vm->pid, SIGTERM);
VIR_FORCE_CLOSE(priv->monitor);

2
src/util/util.c
View File

@ -2133,7 +2133,7 @@ check_and_return:
}
/* send signal to a single process */
int virKillProcess(pid_t pid, int sig)
int virProcessKill(pid_t pid, int sig)
{
if (pid <= 1) {
errno = ESRCH;

2
src/util/util.h
View File

@ -225,7 +225,7 @@ static inline int getgid (void) { return 0; }
char *virGetHostname(virConnectPtr conn);
int virKillProcess(pid_t pid, int sig);
int virProcessKill(pid_t pid, int sig);
char *virGetUserDirectory(uid_t uid);
char *virGetUserName(uid_t uid);