[PATCH v1 30/34] qemuDomainNamespaceTeardownHostdev: Unlink paths in one go

Ján Tomko jtomko at redhat.com
Fri Jul 24 15:50:33 UTC 2020


On a Wednesday in 2020, Michal Privoznik wrote:
>In my attempt to deduplicate the code, we can use
>qemuDomainSetupHostdev() to obtain the list of paths to unlink
>and then pass it to qemuDomainNamespaceUnlinkPaths() to unlink
>them in a single fork.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/qemu/qemu_domain_namespace.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
>diff --git a/src/qemu/qemu_domain_namespace.c b/src/qemu/qemu_domain_namespace.c
>index 135842e212..8251554e73 100644
>--- a/src/qemu/qemu_domain_namespace.c
>+++ b/src/qemu/qemu_domain_namespace.c
>@@ -1451,20 +1451,18 @@ int
> qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm,
>                                    virDomainHostdevDefPtr hostdev)
> {
>-    g_autofree char *path = NULL;
>+    VIR_AUTOSTRINGLIST paths = NULL;
>
>     if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
>         return 0;
>
>-    if (qemuDomainGetHostdevPath(hostdev, &path, NULL) < 0)
>+    if (qemuDomainSetupHostdev(vm,

Yeah, SetupHostdev is definitely a misleading name.

GetHostdevPaths?
PrepareHostdevPaths?

>+                               hostdev,
>+                               true,
>+                               &paths) < 0)
>         return -1;
>
>-    if (path && qemuDomainNamespaceUnlinkPath(vm, path) < 0)
>-        return -1;
>-
>-    if (qemuHostdevNeedsVFIO(hostdev) &&
>-        !qemuDomainNeedsVFIO(vm->def) &&
>-        qemuDomainNamespaceUnlinkPath(vm, QEMU_DEV_VFIO) < 0)
>+    if (qemuDomainNamespaceUnlinkPaths(vm, (const char **) paths) < 0)
>         return -1;
>

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200724/426b5472/attachment-0001.sig>


More information about the libvir-list mailing list