From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 21 Aug 2020 13:49:29 +0000 (+0200)
Subject: qemu_namespace: Don't build namespace if domain doesn't have it enabled
X-Git-Tag: v6.7.0-rc1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db37396e4106821099d345ec5cf93d21f599959b;p=thirdparty%2Flibvirt.git

qemu_namespace: Don't build namespace if domain doesn't have it enabled

Even if namespaces are disabled, then due to a missing check at the
beginning of qemuDomainBuildNamespace(), the domain startup code
still tries to populate (nonexistent) domain's namespace.

Fixes: 8da362fe62766b4eee209cd3ce591ceb62299d13
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
index 797722b714..b6724a095f 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -616,6 +616,11 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
 {
     VIR_AUTOSTRINGLIST paths = NULL;
 
+    if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) {
+        VIR_DEBUG("namespaces disabled for domain %s", vm->def->name);
+        return 0;
+    }
+
     if (qemuDomainPopulateDevices(cfg, &paths) < 0)
         return -1;