From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 21 Jul 2020 14:27:52 +0000 (+0200)
Subject: qemuDomainNamespaceTeardownInput: Deduplicate code
X-Git-Tag: v6.7.0-rc1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4f3e6de4af28a8c56b33429aa31b4ae9b3bc70e;p=thirdparty%2Flibvirt.git

qemuDomainNamespaceTeardownInput: Deduplicate code

We can use qemuDomainSetupInput() to obtain the path that we
need to unlink() from within domain's namespace.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
index 41fbede737..797722b714 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -1359,16 +1359,6 @@ qemuNamespaceUnlinkPaths(virDomainObjPtr vm,
 }
 
 
-static int
-qemuNamespaceUnlinkPath(virDomainObjPtr vm,
-                        const char *path)
-{
-    const char *paths[] = { path, NULL };
-
-    return qemuNamespaceUnlinkPaths(vm, paths);
-}
-
-
 int
 qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
                              virStorageSourcePtr src)
@@ -1604,15 +1594,15 @@ int
 qemuDomainNamespaceTeardownInput(virDomainObjPtr vm,
                                  virDomainInputDefPtr input)
 {
-    const char *path = NULL;
+    VIR_AUTOSTRINGLIST paths = NULL;
 
     if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
         return 0;
 
-    if (!(path = virDomainInputDefGetPath(input)))
-        return 0;
+    if (qemuDomainSetupInput(input, &paths) < 0)
+        return -1;
 
-    if (path && qemuNamespaceUnlinkPath(vm, path) < 0)
+    if (qemuNamespaceUnlinkPaths(vm, (const char **) paths) < 0)
         return -1;
 
     return 0;