[PATCH 5/7] Revert "qemuSecurityDomainRestorePathLabel: Introduce @ignoreNS argument"

Michal Privoznik mprivozn at redhat.com
Wed Jul 1 16:15:05 UTC 2020


The only consumer was removed in the previous commit.

This reverts commit f03a38bd1d28eaa95402742da6ff64f3f633a979.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_security.c | 6 ++----
 src/qemu/qemu_security.h | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
index e35394b2f6..34cfcd3256 100644
--- a/src/qemu/qemu_security.c
+++ b/src/qemu/qemu_security.c
@@ -610,15 +610,13 @@ qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
 int
 qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver,
                                    virDomainObjPtr vm,
-                                   const char *path,
-                                   bool ignoreNS)
+                                   const char *path)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
     pid_t pid = -1;
     int ret = -1;
 
-    if (!ignoreNS &&
-        qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
+    if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
         pid = vm->pid;
 
     if (virSecurityManagerTransactionStart(driver->securityManager) < 0)
diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
index 107a581279..82f4945cd8 100644
--- a/src/qemu/qemu_security.h
+++ b/src/qemu/qemu_security.h
@@ -111,8 +111,7 @@ int qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
 
 int qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver,
                                        virDomainObjPtr vm,
-                                       const char *path,
-                                       bool ignoreNS);
+                                       const char *path);
 
 int qemuSecurityCommandRun(virQEMUDriverPtr driver,
                            virDomainObjPtr vm,
-- 
2.26.2




More information about the libvir-list mailing list