From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 3 Aug 2021 10:45:37 +0000 (+0200)
Subject: qemuNamespaceMknodPaths: Remove 'ndevMountsPath'
X-Git-Tag: v7.7.0-rc1~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b3c391a5572888e9782a83f35790490d45a8ad6;p=thirdparty%2Flibvirt.git

qemuNamespaceMknodPaths: Remove 'ndevMountsPath'

'devMountsPath' can be converted to an auto-cleared stringlist and thus
asking for the number of entries is not necessary.

Signed-off-by: Peter Krempa <pkrempa@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 06169922b9..b2e6ecb71a 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -1250,8 +1250,7 @@ qemuNamespaceMknodPaths(virDomainObj *vm,
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;
     g_autoptr(virQEMUDriverConfig) cfg = NULL;
-    char **devMountsPath = NULL;
-    size_t ndevMountsPath = 0;
+    g_auto(GStrv) devMountsPath = NULL;
     qemuNamespaceMknodData data = { 0 };
     size_t i;
     int ret = -1;
@@ -1261,9 +1260,7 @@ qemuNamespaceMknodPaths(virDomainObj *vm,
         return 0;
 
     cfg = virQEMUDriverGetConfig(driver);
-    if (qemuDomainGetPreservedMounts(cfg, vm,
-                                     &devMountsPath, NULL,
-                                     &ndevMountsPath) < 0)
+    if (qemuDomainGetPreservedMounts(cfg, vm, &devMountsPath, NULL, NULL) < 0)
         return -1;
 
     data.driver = driver;
@@ -1304,7 +1301,6 @@ qemuNamespaceMknodPaths(virDomainObj *vm,
         }
     }
     qemuNamespaceMknodDataClear(&data);
-    virStringListFreeCount(devMountsPath, ndevMountsPath);
     return ret;
 }