qemu_domain_namespace: Rename qemuDomainCreateNamespace()

The name of this function is not very helpful, because it doesn't
create anything, it just flips a bit in a bitmask when domain is
starting up. Move the function internals into qemu_process.c and
forget the function ever existed.

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 e13762ee5d64dde145ae1274815118a81be94b1b..e346eb83e898ed61060a8397a96815c95289707f 100644 (file)
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -1035,20 +1035,6 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
 }
 
 
-int
-qemuDomainCreateNamespace(virQEMUDriverPtr driver,
-                          virDomainObjPtr vm)
-{
-    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-
-    if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) &&
-        qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 bool
 qemuDomainNamespaceEnabled(virDomainObjPtr vm,
                            qemuDomainNamespace ns)

diff --git a/src/qemu/qemu_namespace.h b/src/qemu/qemu_namespace.h
index 9eace2b5c731d0e88c76320015a97fc513599576..a123f1734b09e8bf180408f1fc32e54e87071bad 100644 (file)
--- a/src/qemu/qemu_namespace.h
+++ b/src/qemu/qemu_namespace.h
@@ -41,9 +41,6 @@ int qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
                              virSecurityManagerPtr mgr,
                              virDomainObjPtr vm);
 
-int qemuDomainCreateNamespace(virQEMUDriverPtr driver,
-                              virDomainObjPtr vm);
-
 void qemuDomainDestroyNamespace(virQEMUDriverPtr driver,
                                 virDomainObjPtr vm);
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1e92207c30f088cb28587b8b742bf712d269a76a..629406fd2e57b562dcdfabf0fd786eb7dc2e04fb 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6640,6 +6640,20 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriverPtr driver,
 }
 
 
+static int
+qemuProcessEnableDomainNamespaces(virQEMUDriverPtr driver,
+                                  virDomainObjPtr vm)
+{
+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+
+    if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) &&
+        qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 /**
  * qemuProcessLaunch:
  *
@@ -6759,7 +6773,7 @@ qemuProcessLaunch(virConnectPtr conn,
 
     VIR_DEBUG("Building mount namespace");
 
-    if (qemuDomainCreateNamespace(driver, vm) < 0)
+    if (qemuProcessEnableDomainNamespaces(driver, vm) < 0)
         goto cleanup;
 
     VIR_DEBUG("Setting up raw IO");