qemuDomainNamespaceMknodPaths: Create more files in one go

While the previous commit prepared the helper function run in a
forked off helper (with corresponding struct), this commit
modifies the caller, which now create all files requested in a
single process and does not fork off for every single path.

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 7e8f8d2f2ce4b14409a0b3ba553583180e73763f..32973ad14fd1bf27271bd9a5b9b4b23c266d4457 100644 (file)
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -1385,12 +1385,12 @@ qemuNamespaceMknodItemInit(qemuNamespaceMknodItemPtr item,
 
 
 static int
-qemuNamespaceAttachDeviceMknodOne(qemuNamespaceMknodDataPtr data,
-                                  virQEMUDriverConfigPtr cfg,
-                                  virDomainObjPtr vm,
-                                  const char *file,
-                                  char * const *devMountsPath,
-                                  size_t ndevMountsPath)
+qemuNamespacePrepareOneItem(qemuNamespaceMknodDataPtr data,
+                            virQEMUDriverConfigPtr cfg,
+                            virDomainObjPtr vm,
+                            const char *file,
+                            char * const *devMountsPath,
+                            size_t ndevMountsPath)
 {
     long ttl = sysconf(_SC_SYMLOOP_MAX);
     const char *next = file;
@@ -1433,23 +1433,36 @@ qemuNamespaceAttachDeviceMknodOne(qemuNamespaceMknodDataPtr data,
 
 
 static int
-qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver,
-                            virDomainObjPtr vm,
-                            const char *file,
-                            char * const *devMountsPath,
-                            size_t ndevMountsPath)
+qemuNamespaceMknodPaths(virDomainObjPtr vm,
+                        const char **paths,
+                        size_t npaths)
 {
-    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+    qemuDomainObjPrivatePtr priv = vm->privateData;
+    virQEMUDriverPtr driver = priv->driver;
+    g_autoptr(virQEMUDriverConfig) cfg = NULL;
+    char **devMountsPath = NULL;
+    size_t ndevMountsPath = 0;
     qemuNamespaceMknodData data = { 0 };
     size_t i;
     int ret = -1;
 
+    if (npaths == 0)
+        return 0;
+
+    cfg = virQEMUDriverGetConfig(driver);
+    if (qemuDomainGetPreservedMounts(cfg, vm,
+                                     &devMountsPath, NULL,
+                                     &ndevMountsPath) < 0)
+        return -1;
+
     data.driver = driver;
     data.vm = vm;
 
-    if (qemuNamespaceAttachDeviceMknodOne(&data, cfg, vm, file,
-                                          devMountsPath, ndevMountsPath) < 0)
-        return -1;
+    for (i = 0; i < npaths; i++) {
+        if (qemuNamespacePrepareOneItem(&data, cfg, vm, paths[i],
+                                        devMountsPath, ndevMountsPath) < 0)
+            goto cleanup;
+    }
 
     for (i = 0; i < data.nitems; i++) {
         qemuNamespaceMknodItemPtr item = &data.items[i];
@@ -1481,6 +1494,7 @@ qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver,
         }
     }
     qemuNamespaceMknodDataClear(&data);
+    virStringListFreeCount(devMountsPath, ndevMountsPath);
     return ret;
 }
 
@@ -1489,11 +1503,9 @@ qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver,
 
 
 static int
-qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver G_GNUC_UNUSED,
-                            virDomainObjPtr vm G_GNUC_UNUSED,
-                            const char *file G_GNUC_UNUSED,
-                            char * const *devMountsPath G_GNUC_UNUSED,
-                            size_t ndevMountsPath G_GNUC_UNUSED)
+qemuNamespaceMknodPaths(virDomainObjPtr vm G_GNUC_UNUSED,
+                        const char **paths G_GNUC_UNUSED,
+                        size_t npaths G_GNUC_UNUSED)
 {
     virReportSystemError(ENOSYS, "%s",
                          _("Namespaces are not supported on this platform."));
@@ -1550,50 +1562,13 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver G_GNUC_UNUSED,
 }
 
 
-static int
-qemuDomainNamespaceMknodPaths(virDomainObjPtr vm,
-                              const char **paths,
-                              size_t npaths)
-{
-    qemuDomainObjPrivatePtr priv = vm->privateData;
-    virQEMUDriverPtr driver = priv->driver;
-    g_autoptr(virQEMUDriverConfig) cfg = NULL;
-    char **devMountsPath = NULL;
-    size_t ndevMountsPath = 0;
-    int ret = -1;
-    size_t i;
-
-    if (!npaths)
-        return 0;
-
-    cfg = virQEMUDriverGetConfig(driver);
-    if (qemuDomainGetPreservedMounts(cfg, vm,
-                                     &devMountsPath, NULL,
-                                     &ndevMountsPath) < 0)
-        goto cleanup;
-
-    for (i = 0; i < npaths; i++) {
-        if (qemuDomainAttachDeviceMknod(driver,
-                                        vm,
-                                        paths[i],
-                                        devMountsPath, ndevMountsPath) < 0)
-            goto cleanup;
-    }
-
-    ret = 0;
- cleanup:
-    virStringListFreeCount(devMountsPath, ndevMountsPath);
-    return ret;
-}
-
-
 static int
 qemuDomainNamespaceMknodPath(virDomainObjPtr vm,
                              const char *path)
 {
     const char *paths[] = { path };
 
-    return qemuDomainNamespaceMknodPaths(vm, paths, 1);
+    return qemuNamespaceMknodPaths(vm, paths, 1);
 }
 
 
@@ -1700,7 +1675,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
         return -1;
 
     npaths = virStringListLength((const char **) paths);
-    if (qemuDomainNamespaceMknodPaths(vm, (const char **) paths, npaths) < 0)
+    if (qemuNamespaceMknodPaths(vm, (const char **) paths, npaths) < 0)
         return -1;
 
     return 0;
@@ -1755,7 +1730,7 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm,
         return -1;
 
     npaths = virStringListLength((const char **) paths);
-    if (qemuDomainNamespaceMknodPaths(vm, (const char **) paths, npaths) < 0)
+    if (qemuNamespaceMknodPaths(vm, (const char **) paths, npaths) < 0)
         return -1;
 
     return 0;