[libvirt] [PATCH 1/5] Rename virKillProcess to virProcessKill
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Changing naming to follow the convention of "object" followed
by "action"
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_monitor.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/uml/uml_driver.c | 2 +-
src/util/util.c | 2 +-
src/util/util.h | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 488aa99..2eae3f2 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -219,7 +219,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;
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fa3b7b2..aec7b6c 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -283,7 +283,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;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ec312d1..637f7be 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3920,7 +3920,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",
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 8fd18f9..6d0ef79 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -1128,7 +1128,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);
diff --git a/src/util/util.c b/src/util/util.c
index 3faadb2..8ad38ec 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2290,7 +2290,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;
diff --git a/src/util/util.h b/src/util/util.h
index ad72f67..501373d 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -255,7 +255,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(void);
char *virGetUserConfigDirectory(void);
--
1.7.11.2