From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 21 Jul 2020 10:14:02 +0000 (+0200)
Subject: qemuDomainNamespaceSetupHostdev: Create paths in one go
X-Git-Tag: v6.7.0-rc1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d8d42137a3f31ddd7dbf96c9e930868e6d24053;p=thirdparty%2Flibvirt.git

qemuDomainNamespaceSetupHostdev: Create paths in one go

While qemuDomainNamespaceMknodPaths() doesn't actually create
files in the namespace in one go (it forks for each path), it a
few commits time it will.

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 663a542ff2..063e11bb6d 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -1655,6 +1655,8 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm,
                                 virDomainHostdevDefPtr hostdev)
 {
     g_autofree char *path = NULL;
+    VIR_AUTOSTRINGLIST paths = NULL;
+    size_t npaths = 0;
 
     if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
         return 0;
@@ -1662,12 +1664,16 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm,
     if (qemuDomainGetHostdevPath(hostdev, &path, NULL) < 0)
         return -1;
 
-    if (path && qemuDomainNamespaceMknodPath(vm, path) < 0)
+    if (path && virStringListAdd(&paths, path) < 0)
         return -1;
 
     if (qemuHostdevNeedsVFIO(hostdev) &&
         !qemuDomainNeedsVFIO(vm->def) &&
-        qemuDomainNamespaceMknodPath(vm, QEMU_DEV_VFIO) < 0)
+        virStringListAdd(&paths, QEMU_DEV_VFIO) < 0)
+        return -1;
+
+    npaths = virStringListLength((const char **) paths);
+    if (qemuDomainNamespaceMknodPaths(vm, (const char **) paths, npaths) < 0)
         return -1;
 
     return 0;