]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuDomainNamespaceTeardownRNG: Deduplicate code
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 21 Jul 2020 14:26:48 +0000 (16:26 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 3 Aug 2020 18:00:34 +0000 (20:00 +0200)
We can use qemuDomainSetupRNG() to obtain the path that we
need to unlink() from within domain's namespace.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_namespace.c

index d3451a5aa42c8e04f19a3cbf0122d51b3ab35fe4..41fbede737d8419e790174b880967b2fdc0e3528 100644 (file)
@@ -1567,23 +1567,15 @@ int
 qemuDomainNamespaceTeardownRNG(virDomainObjPtr vm,
                                virDomainRNGDefPtr rng)
 {
-    const char *path = NULL;
+    VIR_AUTOSTRINGLIST paths = NULL;
 
     if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
         return 0;
 
-    switch ((virDomainRNGBackend) rng->backend) {
-    case VIR_DOMAIN_RNG_BACKEND_RANDOM:
-        path = rng->source.file;
-        break;
-
-    case VIR_DOMAIN_RNG_BACKEND_EGD:
-    case VIR_DOMAIN_RNG_BACKEND_BUILTIN:
-    case VIR_DOMAIN_RNG_BACKEND_LAST:
-        break;
-    }
+    if (qemuDomainSetupRNG(rng, &paths) < 0)
+        return -1;
 
-    if (path && qemuNamespaceUnlinkPath(vm, path) < 0)
+    if (qemuNamespaceUnlinkPaths(vm, (const char **) paths) < 0)
         return -1;
 
     return 0;