Rename virPid{Abort,Wait} to virProcess{Abort,Wait}

Change "Pid" to "Process" to align with the virProcessKill
API naming prefix

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

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 349ffd63d37694f9d254799d26016149b3c1feb4..8023b39b1d3b6208dd5b9b5363f4a01a835400b8 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -196,7 +196,7 @@ static int daemonForkIntoBackground(const char *argv0)
             VIR_FORCE_CLOSE(statuspipe[1]);
 
             /* We wait to make sure the first child forked successfully */
-            if (virPidWait(pid, NULL) < 0)
+            if (virProcessWait(pid, NULL) < 0)
                 goto error;
 
             /* If we get here, then the grandchild was spawned, so we

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 0b6068d4415bc22fccf66ff2b3ddb642cfefcee3..362621ddee374800ec331ba80dc3c5f44666f337 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -166,8 +166,8 @@ virCommandTranslateStatus;
 virCommandWait;
 virCommandWriteArgLog;
 virFork;
-virPidAbort;
-virPidWait;
+virProcessAbort;
+virProcessWait;
 virRun;
 
 

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 4bb2affdb1e75a1ad92b535452f0ecf7069fa2c3..0c7e029274e8aaddeae78d19a979921ee386f78d 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -163,7 +163,7 @@ int lxcContainerHasReboot(void)
         virReportSystemError(errno, "%s",
                              _("Unable to clone to check reboot support"));
         return -1;
-    } else if (virPidWait(cpid, &status) < 0) {
+    } else if (virProcessWait(cpid, &status) < 0) {
         return -1;
     }
 
@@ -2001,7 +2001,7 @@ int lxcContainerAvailable(int features)
         VIR_DEBUG("clone call returned %s, container support is not enabled",
                   virStrerror(errno, ebuf, sizeof(ebuf)));
         return -1;
-    } else if (virPidWait(cpid, NULL) < 0) {
+    } else if (virProcessWait(cpid, NULL) < 0) {
         return -1;
     }
 

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index d2e80948cd28879b7327e3855e4c884244af30ad..87601b373aa68360a4d079b95056cd0a98fefd2b 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -214,7 +214,7 @@ static void virLXCControllerStopInit(virLXCControllerPtr ctrl)
         return;
 
     virLXCControllerCloseLoopDevices(ctrl, true);
-    virPidAbort(ctrl->initpid);
+    virProcessAbort(ctrl->initpid);
     ctrl->initpid = 0;
 }
 

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index a96fedabec8cd27ce2a6eb69c4af94b33255c2bf..e85fbf18929ae8c368dd0142434b288306c24e26 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -914,7 +914,7 @@ void virNetSocketDispose(void *obj)
     VIR_FORCE_CLOSE(sock->fd);
     VIR_FORCE_CLOSE(sock->errfd);
 
-    virPidAbort(sock->pid);
+    virProcessAbort(sock->pid);
 
     VIR_FREE(sock->localAddrStr);
     VIR_FREE(sock->remoteAddrStr);

diff --git a/src/util/command.c b/src/util/command.c
index 1adf7b956fd7c3fae94d5a929c2d59458ceecba9..ecfb01594e3b0978b19db513234dadd9b17863a8 100644 (file)
--- a/src/util/command.c
+++ b/src/util/command.c
@@ -1691,7 +1691,7 @@ virCommandToString(virCommandPtr cmd)
  * @status: child exit status to translate
  *
  * Translate an exit status into a malloc'd string.  Generic helper
- * for virCommandRun(), virCommandWait(), virRun(), and virPidWait()
+ * for virCommandRun(), virCommandWait(), virRun(), and virProcessWait()
  * status argument, as well as raw waitpid().
  */
 char *
@@ -2164,7 +2164,7 @@ virCommandHook(void *data)
  * for pid.  While cmd is still in scope, you may reap the child via
  * virCommandWait or virCommandAbort.  But after virCommandFree, if
  * you have not yet reaped the child, then it continues to run until
- * you call virPidWait or virPidAbort.
+ * you call virProcessWait or virProcessAbort.
  */
 int
 virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
@@ -2257,7 +2257,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
 
 
 /**
- * virPidWait:
+ * virProcessWait:
  * @pid: child to wait on
  * @exitstatus: optional status collection
  *
@@ -2268,7 +2268,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
  * child must exit with status 0 for this to succeed.
  */
 int
-virPidWait(pid_t pid, int *exitstatus)
+virProcessWait(pid_t pid, int *exitstatus)
 {
     int ret;
     int status;
@@ -2338,13 +2338,13 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
         return -1;
     }
 
-    /* If virPidWait reaps pid but then returns failure because
+    /* If virProcessWait reaps pid but then returns failure because
      * exitstatus was NULL, then a second virCommandWait would risk
      * calling waitpid on an unrelated process.  Besides, that error
      * message is not as detailed as what we can provide.  So, we
-     * guarantee that virPidWait only fails due to failure to wait,
+     * guarantee that virProcessWait only fails due to failure to wait,
      * and repeat the exitstatus check code ourselves.  */
-    ret = virPidWait(cmd->pid, exitstatus ? exitstatus : &status);
+    ret = virProcessWait(cmd->pid, exitstatus ? exitstatus : &status);
     if (ret == 0) {
         cmd->pid = -1;
         cmd->reap = false;
@@ -2370,7 +2370,7 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
 
 #ifndef WIN32
 /**
- * virPidAbort:
+ * virProcessAbort:
  * @pid: child process to kill
  *
  * Abort a child process if PID is positive and that child is still
@@ -2380,7 +2380,7 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
  * this does nothing.
  */
 void
-virPidAbort(pid_t pid)
+virProcessAbort(pid_t pid)
 {
     int saved_errno;
     int ret;
@@ -2444,13 +2444,13 @@ virCommandAbort(virCommandPtr cmd)
 {
     if (!cmd || cmd->pid == -1)
         return;
-    virPidAbort(cmd->pid);
+    virProcessAbort(cmd->pid);
     cmd->pid = -1;
     cmd->reap = false;
 }
 #else /* WIN32 */
 void
-virPidAbort(pid_t pid)
+virProcessAbort(pid_t pid)
 {
     /* Not yet ported to mingw.  Any volunteers?  */
     VIR_DEBUG("failed to reap child %lld, abandoning it", (long long)pid);
@@ -2617,7 +2617,7 @@ int virCommandHandshakeNotify(virCommandPtr cmd)
  *
  * Release all resources.  The only exception is that if you called
  * virCommandRunAsync with a non-null pid, then the asynchronous child
- * is not reaped, and you must call virPidWait() or virPidAbort() yourself.
+ * is not reaped, and you must call virProcessWait() or virProcessAbort() yourself.
  */
 void
 virCommandFree(virCommandPtr cmd)

diff --git a/src/util/command.h b/src/util/command.h
index d1a1bf9f71d8a0b46c13f89903d3fe250e944df8..de17a43fa6753e31b38b18464ca17ae9b1cbc36a 100644 (file)
--- a/src/util/command.h
+++ b/src/util/command.h
@@ -151,8 +151,8 @@ int virCommandRun(virCommandPtr cmd,
 int virCommandRunAsync(virCommandPtr cmd,
                        pid_t *pid) ATTRIBUTE_RETURN_CHECK;
 
-int virPidWait(pid_t pid,
-               int *exitstatus) ATTRIBUTE_RETURN_CHECK;
+int virProcessWait(pid_t pid,
+                   int *exitstatus) ATTRIBUTE_RETURN_CHECK;
 
 int virCommandWait(virCommandPtr cmd,
                    int *exitstatus) ATTRIBUTE_RETURN_CHECK;
@@ -165,7 +165,7 @@ int virCommandHandshakeWait(virCommandPtr cmd)
 int virCommandHandshakeNotify(virCommandPtr cmd)
     ATTRIBUTE_RETURN_CHECK;
 
-void virPidAbort(pid_t pid);
+void virProcessAbort(pid_t pid);
 
 void virCommandAbort(virCommandPtr cmd);
 

diff --git a/src/util/util.c b/src/util/util.c
index 8ad38ec5a36ec41667fdbf52665d133161869b5c..5bf82dc2f3b7750ada306004af70938db1060bb9 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -729,10 +729,10 @@ virFileAccessibleAs(const char *path, int mode,
     }
 
     if (pid) { /* parent */
-        if (virPidWait(pid, &status) < 0) {
-            /* virPidWait() already
+        if (virProcessWait(pid, &status) < 0) {
+            /* virProcessWait() already
              * reported error */
-                return -1;
+            return -1;
         }
 
         if (!WIFEXITED(status)) {

diff --git a/tests/testutils.c b/tests/testutils.c
index b555e062141fa1dc594ffc9fdc4b8f6550d307f4..004731d39611a85b38d08850deb59c5a0913ec98 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -329,7 +329,7 @@ virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
         VIR_FORCE_CLOSE(pipefd[1]);
         len = virFileReadLimFD(pipefd[0], maxlen, buf);
         VIR_FORCE_CLOSE(pipefd[0]);
-        if (virPidWait(pid, NULL) < 0)
+        if (virProcessWait(pid, NULL) < 0)
             return -1;
 
         return len;
@@ -699,7 +699,7 @@ int virtTestMain(int argc,
             } else {
                 int i, status;
                 for (i = 0 ; i < mp ; i++) {
-                    if (virPidWait(workers[i], NULL) < 0)
+                    if (virProcessWait(workers[i], NULL) < 0)
                         ret = EXIT_FAILURE;
                 }
                 VIR_FREE(workers);