10:14 p.m.
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Change "Pid" to "Process" to align with the virProcessKill
API naming prefix
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
(cherry picked from commit 0fb58ef5cd477cf9a0efdd966a22440ef087a2af)
Signed-off-by: Eric Blake <eblake(a)redhat.com>
Conflicts:
src/util/util.c
src/lxc/lxc_container.c
src/lxc/lxc_controller.c
---
daemon/libvirtd.c | 2 +-
src/libvirt_private.syms | 4 ++--
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/rpc/virnetsocket.c | 2 +-
src/util/command.c | 24 ++++++++++++------------
src/util/command.h | 6 +++---
src/util/util.c | 6 +++---
tests/testutils.c | 4 ++--
9 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 5d57b50..e9db433 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -192,7 +192,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 8328fcf..5d8ff7b 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -144,8 +144,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 0636eab..442aa24 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1519,7 +1519,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 26b3115..b5cec3d 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -1626,7 +1626,7 @@ cleanup:
VIR_FORCE_CLOSE(loopDevs[i]);
VIR_FREE(loopDevs);
- virPidAbort(container);
+ virProcessAbort(container);
return rc;
}
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index fa16d31..040090e 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -752,7 +752,7 @@ void virNetSocketFree(virNetSocketPtr sock)
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 eaa9f16..4340659 100644
--- a/src/util/command.c
+++ b/src/util/command.c
@@ -1652,7 +1652,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 *
@@ -2114,7 +2114,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)
@@ -2207,7 +2207,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
/**
- * virPidWait:
+ * virProcessWait:
* @pid: child to wait on
* @exitstatus: optional status collection
*
@@ -2218,7 +2218,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;
@@ -2288,13 +2288,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;
@@ -2316,7 +2316,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
@@ -2326,7 +2326,7 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
* this does nothing.
*/
void
-virPidAbort(pid_t pid)
+virProcessAbort(pid_t pid)
{
int saved_errno;
int ret;
@@ -2390,13 +2390,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);
@@ -2553,7 +2553,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 07aa0b3..d8a8c83 100644
--- a/src/util/command.h
+++ b/src/util/command.h
@@ -148,8 +148,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;
@@ -162,7 +162,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 bb15518..e1f8d1e 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -718,10 +718,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 6eb40ed..63bec52 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -314,7 +314,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;
@@ -684,7 +684,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);
--
1.8.3.1