Rename virKillProcess to virProcessKill

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

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 488aa991a16ba5e5e724d0e320411c1d91d96888..2eae3f2a07f1db5019fb1463b0bfdd2b4b625ab5 100644 (file)
--- 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 fa3b7b267a63e67279af0b0fb52ee6852ab995d9..aec7b6c5111ec25ee3f6f485d30251fd5a70655d 100644 (file)
--- 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 ec312d15c08844a6f93a1efe3c68934e8cd1eb9e..637f7be5cb102368c6220dcc3d472932ccf1c1db 100644 (file)
--- 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 8fd18f9ef30297c2f75fc158a11002857233f4a9..6d0ef7907b92a40440875cf8cab658ecf9c01c7f 100644 (file)
--- 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 3faadb26a9fd97a362b5345098fc110b3f6b7d2e..8ad38ec5a36ec41667fdbf52665d133161869b5c 100644 (file)
--- 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 ad72f679688e02e784ae470e220847c0826d9311..501373d1aba7d10d5036933de660c7a909fea27a 100644 (file)
--- 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);