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>
This commit is contained in:
parent
90eee87569
commit
764eaf1aa4
@ -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
|
bool
|
||||||
qemuDomainNamespaceEnabled(virDomainObjPtr vm,
|
qemuDomainNamespaceEnabled(virDomainObjPtr vm,
|
||||||
qemuDomainNamespace ns)
|
qemuDomainNamespace ns)
|
||||||
|
@ -41,9 +41,6 @@ int qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
|
|||||||
virSecurityManagerPtr mgr,
|
virSecurityManagerPtr mgr,
|
||||||
virDomainObjPtr vm);
|
virDomainObjPtr vm);
|
||||||
|
|
||||||
int qemuDomainCreateNamespace(virQEMUDriverPtr driver,
|
|
||||||
virDomainObjPtr vm);
|
|
||||||
|
|
||||||
void qemuDomainDestroyNamespace(virQEMUDriverPtr driver,
|
void qemuDomainDestroyNamespace(virQEMUDriverPtr driver,
|
||||||
virDomainObjPtr vm);
|
virDomainObjPtr vm);
|
||||||
|
|
||||||
|
@ -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:
|
* qemuProcessLaunch:
|
||||||
*
|
*
|
||||||
@ -6759,7 +6773,7 @@ qemuProcessLaunch(virConnectPtr conn,
|
|||||||
|
|
||||||
VIR_DEBUG("Building mount namespace");
|
VIR_DEBUG("Building mount namespace");
|
||||||
|
|
||||||
if (qemuDomainCreateNamespace(driver, vm) < 0)
|
if (qemuProcessEnableDomainNamespaces(driver, vm) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
VIR_DEBUG("Setting up raw IO");
|
VIR_DEBUG("Setting up raw IO");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user