External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Revert "qemuSecurityDomainRestorePathLabel: Introduce @ignoreNS argument"

Browse Source 
The only consumer was removed in the previous commit.

This reverts commit f03a38bd1d28eaa95402742da6ff64f3f633a979.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2020-06-30 19:49:12 +02:00
parent 824e349397
commit 7e235954e5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_security.c
View File

@ -610,15 +610,13 @@ qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
int int
qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver, qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *path, const char *path)
bool ignoreNS)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
pid_t pid = -1; pid_t pid = -1;
int ret = -1; int ret = -1;
if (!ignoreNS && if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
pid = vm->pid; pid = vm->pid;
if (virSecurityManagerTransactionStart(driver->securityManager) < 0) if (virSecurityManagerTransactionStart(driver->securityManager) < 0)

3
src/qemu/qemu_security.h
View File

@ -111,8 +111,7 @@ int qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
int qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver, int qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *path, const char *path);
bool ignoreNS);
int qemuSecurityCommandRun(virQEMUDriverPtr driver, int qemuSecurityCommandRun(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,