Rename virKillProcess to virProcessKill

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)

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index bc4ceff08d1108767d49d9eec57a0696cdb6cddb..1e3e327443e6c803fb17f928d5a042c5400709cf 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -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;

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 68ecdb957f5b7bd0fc1dad22f538e65dd249b34b..cfe1a25a811037bb5397602546b09711c1dffa71 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -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;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d226067a1a75eca333d5852a895876acfb0f8396..7fc87f4cbe3eb630cbe57746303d4bccaa10337e 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -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",

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 4e640ff67ae77b0234aae897b3df071463b621dd..8db78b8ceff92f265a3f4f93058eaf2f37b13ffc 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -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);
 

diff --git a/src/util/util.c b/src/util/util.c
index 48358b233ab082593988295159fec180ce5703b8..bb155184bff180c8776047f2de93371d7e69d558 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -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;

diff --git a/src/util/util.h b/src/util/util.h
index 85e8bd66fd73bb2d3477b8008e537bb78e6266ca..838bff72a0ad70927001dfc8cc3470fa2e8a4ae3 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -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);