From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 21 Jul 2020 13:05:52 +0000 (+0200)
Subject: qemuDomainNamespaceUnlinkPaths: Turn @paths into string list
X-Git-Tag: v6.7.0-rc1~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7feac4ba8dcce3a97e45e416b1bf5f2b416e25b;p=thirdparty%2Flibvirt.git

qemuDomainNamespaceUnlinkPaths: Turn @paths into string list

So far, the only caller qemuDomainNamespaceUnlinkPath() will
always pass a single path to unlink, but similarly to
qemuDomainNamespaceMknodPaths() - there are a few callers that
would like to pass two or more files to unlink at once (held in a
string list). Make the @paths argument a string list then.

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 d290da47e5..b3e95f1724 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -1306,8 +1306,7 @@ qemuNamespaceUnlinkHelper(pid_t pid G_GNUC_UNUSED,
 
 static int
 qemuNamespaceUnlinkPaths(virDomainObjPtr vm,
-                         const char **paths,
-                         size_t npaths)
+                         const char **paths)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
     virQEMUDriverPtr driver = priv->driver;
@@ -1315,9 +1314,11 @@ qemuNamespaceUnlinkPaths(virDomainObjPtr vm,
     VIR_AUTOSTRINGLIST unlinkPaths = NULL;
     char **devMountsPath = NULL;
     size_t ndevMountsPath = 0;
+    size_t npaths;
     size_t i;
     int ret = -1;
 
+    npaths = virStringListLength(paths);
     if (!npaths)
         return 0;
 
@@ -1362,9 +1363,9 @@ static int
 qemuNamespaceUnlinkPath(virDomainObjPtr vm,
                         const char *path)
 {
-    const char *paths[] = { path };
+    const char *paths[] = { path, NULL };
 
-    return qemuNamespaceUnlinkPaths(vm, paths, 1);
+    return qemuNamespaceUnlinkPaths(vm, paths);
 }