virprocess: virProcessGetNamespaces() to void

virProcessGetNamespaces() return value is invariant, so change it
type and remove all dependent checks.

Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
index ecc1207ca99bbd837237201c200d48007655c113..99bb45070277b01a1fbf9435748d793a9ab9c287 100644 (file)
--- a/src/libvirt-lxc.c
+++ b/src/libvirt-lxc.c
@@ -140,10 +140,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain,
 
     if (noldfdlist && oldfdlist) {
         size_t nfds;
-        if (virProcessGetNamespaces(getpid(),
-                                    &nfds,
-                                    oldfdlist) < 0)
-            goto error;
+        virProcessGetNamespaces(getpid(), &nfds, oldfdlist);
         *noldfdlist = nfds;
     }
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3e9c1395bfee78534a4856bea22a54cb27ae00a5..c2819986525cf6114c6ee68ea26618e0ecaa8fd6 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4691,8 +4691,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom,
         goto endjob;
     }
 
-    if (virProcessGetNamespaces(priv->initpid, &nfds, fdlist) < 0)
-        goto endjob;
+    virProcessGetNamespaces(priv->initpid, &nfds, fdlist);
 
     ret = nfds;
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 696d526a5d36f100598db448bda133236e965540..7770e7e7ebfbbd9ecb7033cb0df13fec65f66e3a 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2737,8 +2737,7 @@ qemuProcessStartPRDaemonHook(void *opaque)
     int ret = -1;
 
     if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) {
-        if (virProcessGetNamespaces(vm->pid, &nfds, &fds) < 0)
-            return ret;
+        virProcessGetNamespaces(vm->pid, &nfds, &fds);
 
         if (nfds > 0 &&
             virProcessSetNamespaces(nfds, fds) < 0)

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index b6fb17db833e58346325494ac014def021fbd41a..047b0aa0cdfd202081b7260962691514484c9aad 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -652,9 +652,9 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids)
 }
 
 
-int virProcessGetNamespaces(pid_t pid,
-                            size_t *nfdlist,
-                            int **fdlist)
+void virProcessGetNamespaces(pid_t pid,
+                             size_t *nfdlist,
+                             int **fdlist)
 {
     size_t i = 0;
     const char *ns[] = { "user", "ipc", "uts", "net", "pid", "mnt" };
@@ -673,8 +673,6 @@ int virProcessGetNamespaces(pid_t pid,
             (*fdlist)[(*nfdlist)-1] = fd;
         }
     }
-
-    return 0;
 }
 
 

diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 6008cca4af6a0f628484db290807677d308de44f..9c74ec7e35f092fac6d58918323b9593d444834b 100644 (file)
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -70,9 +70,9 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids);
 int virProcessGetStartTime(pid_t pid,
                            unsigned long long *timestamp);
 
-int virProcessGetNamespaces(pid_t pid,
-                            size_t *nfdlist,
-                            int **fdlist);
+void virProcessGetNamespaces(pid_t pid,
+                             size_t *nfdlist,
+                             int **fdlist);
 
 int virProcessSetNamespaces(size_t nfdlist,
                             int *fdlist);