[libvirt] [PATCH 1/6] qemuDomainNamespaceTeardownHostdev: rename path to paths

Ján Tomko jtomko at redhat.com
Fri Nov 24 17:54:52 UTC 2017


To match the "things/nthings" pattern used in virDomainDef.
---
 src/qemu/qemu_domain.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9dab6b24b..c4a1e6d0b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9766,14 +9766,14 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver,
     char **devMountsPath = NULL;
     size_t ndevMountsPath = 0;
     int ret = -1;
-    char **path = NULL;
+    char **paths = NULL;
     size_t i, npaths = 0;
 
     if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
         return 0;
 
     if (qemuDomainGetHostdevPath(vm->def, hostdev, true,
-                                 &npaths, &path, NULL) < 0)
+                                 &npaths, &paths, NULL) < 0)
         goto cleanup;
 
     cfg = virQEMUDriverGetConfig(driver);
@@ -9783,7 +9783,7 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver,
         goto cleanup;
 
     for (i = 0; i < npaths; i++) {
-        if (qemuDomainDetachDeviceUnlink(driver, vm, path[i],
+        if (qemuDomainDetachDeviceUnlink(driver, vm, paths[i],
                                          devMountsPath, ndevMountsPath) < 0)
             goto cleanup;
     }
@@ -9791,8 +9791,8 @@ qemuDomainNamespaceTeardownHostdev(virQEMUDriverPtr driver,
     ret = 0;
  cleanup:
     for (i = 0; i < npaths; i++)
-        VIR_FREE(path[i]);
-    VIR_FREE(path);
+        VIR_FREE(paths[i]);
+    VIR_FREE(paths);
     virStringListFreeCount(devMountsPath, ndevMountsPath);
     virObjectUnref(cfg);
     return ret;
-- 
2.13.6




More information about the libvir-list mailing list