secdrivers: Rename @stdin_path argument of virSecurityDomainSetAllLabel()

The argument (if not NULL) points to the file the domain is
restoring from. On QEMU command line this used to be '-incoming
$path', but we've switched to passing FD ages ago and thus this
argument is used only in AppArmor (which loads the profile on
domain start). Anyway, the argument does not refer to stdin,
rename it to 'incomingPath' then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 583e87261463f9b55719ba9f2c375d8770f2b473..3f6a213b43cf976249a43aa2f137cb504b515f9f 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -455,7 +455,7 @@ AppArmorGenSecurityLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED,
 static int
 AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr,
                             virDomainDefPtr def,
-                            const char *stdin_path,
+                            const char *incomingPath,
                             bool chardevStdioLogd G_GNUC_UNUSED,
                             bool migrated G_GNUC_UNUSED)
 {
@@ -464,10 +464,10 @@ AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr,
     if (!secdef || !secdef->relabel)
         return 0;
 
-    /* Reload the profile if stdin_path is specified. Note that
+    /* Reload the profile if incomingPath is specified. Note that
        GenSecurityLabel() will have already been run. */
-    if (stdin_path)
-        return reload_profile(mgr, def, stdin_path, true);
+    if (incomingPath)
+        return reload_profile(mgr, def, incomingPath, true);
 
     return 0;
 }

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 23fe351a3238c399c864758c32de5f153b68c0f0..dd701ef28bd14bfa85fa5e5deed73c57b36a15c4 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -2142,7 +2142,7 @@ virSecurityDACSetSysinfoLabel(virSecurityManagerPtr mgr,
 static int
 virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
                           virDomainDefPtr def,
-                          const char *stdin_path G_GNUC_UNUSED,
+                          const char *incomingPath G_GNUC_UNUSED,
                           bool chardevStdioLogd,
                           bool migrated G_GNUC_UNUSED)
 {

diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index f0ba77032d510008a0caede929be729f86609115..08cdf94598113ab8f6cb191dfe302fd4fe8673d9 100644 (file)
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -82,7 +82,7 @@ typedef int (*virSecurityDomainReleaseLabel) (virSecurityManagerPtr mgr,
                                               virDomainDefPtr sec);
 typedef int (*virSecurityDomainSetAllLabel) (virSecurityManagerPtr mgr,
                                              virDomainDefPtr sec,
-                                             const char *stdin_path,
+                                             const char *incomingPath,
                                              bool chardevStdioLogd,
                                              bool migrated);
 typedef int (*virSecurityDomainRestoreAllLabel) (virSecurityManagerPtr mgr,

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index 1399be256ba873cfbd54e679ad91a66badeff255..17b565cc127ca3c4941fc29ac05cbf95bec41bca 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -856,14 +856,14 @@ int virSecurityManagerCheckAllLabel(virSecurityManagerPtr mgr,
 int
 virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr,
                               virDomainDefPtr vm,
-                              const char *stdin_path,
+                              const char *incomingPath,
                               bool chardevStdioLogd,
                               bool migrated)
 {
     if (mgr->drv->domainSetSecurityAllLabel) {
         int ret;
         virObjectLock(mgr);
-        ret = mgr->drv->domainSetSecurityAllLabel(mgr, vm, stdin_path,
+        ret = mgr->drv->domainSetSecurityAllLabel(mgr, vm, incomingPath,
                                                   chardevStdioLogd,
                                                   migrated);
         virObjectUnlock(mgr);

diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index 277151848ec96a9731ade6b0c73d57de89be11b5..1c9e1661740099206d72a123d02c071ea767b799 100644 (file)
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -121,7 +121,7 @@ int virSecurityManagerCheckAllLabel(virSecurityManagerPtr mgr,
                                     virDomainDefPtr sec);
 int virSecurityManagerSetAllLabel(virSecurityManagerPtr mgr,
                                   virDomainDefPtr sec,
-                                  const char *stdin_path,
+                                  const char *incomingPath,
                                   bool chardevStdioLogd,
                                   bool migrated);
 int virSecurityManagerRestoreAllLabel(virSecurityManagerPtr mgr,

diff --git a/src/security/security_nop.c b/src/security/security_nop.c
index de5da1ee1ce55c7cb9f740ffce310d52eb96be35..385a747f5bd9d74b46c35a3416354574c17f9d48 100644 (file)
--- a/src/security/security_nop.c
+++ b/src/security/security_nop.c
@@ -119,7 +119,7 @@ virSecurityDomainReleaseLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED,
 static int
 virSecurityDomainSetAllLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED,
                                 virDomainDefPtr sec G_GNUC_UNUSED,
-                                const char *stdin_path G_GNUC_UNUSED,
+                                const char *incomingPath G_GNUC_UNUSED,
                                 bool chardevStdioLogd G_GNUC_UNUSED,
                                 bool migrated G_GNUC_UNUSED)
 {

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 6b0581e4d9cb74f9bca5e606f51845b2b289383f..52ff4fab0fc0296ca87b855fc686ebe22e28c0dc 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -3169,7 +3169,7 @@ virSecuritySELinuxSetSysinfoLabel(virSecurityManagerPtr mgr,
 static int
 virSecuritySELinuxSetAllLabel(virSecurityManagerPtr mgr,
                               virDomainDefPtr def,
-                              const char *stdin_path G_GNUC_UNUSED,
+                              const char *incomingPath G_GNUC_UNUSED,
                               bool chardevStdioLogd,
                               bool migrated G_GNUC_UNUSED)
 {

diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 624431d4ef0bbb458e462a62c300836b71feee40..2480c47f707df3b5216d07c91c89c76cb9467c7f 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -341,7 +341,7 @@ virSecurityStackRestoreHostdevLabel(virSecurityManagerPtr mgr,
 static int
 virSecurityStackSetAllLabel(virSecurityManagerPtr mgr,
                             virDomainDefPtr vm,
-                            const char *stdin_path,
+                            const char *incomingPath,
                             bool chardevStdioLogd,
                             bool migrated)
 {
@@ -350,7 +350,7 @@ virSecurityStackSetAllLabel(virSecurityManagerPtr mgr,
 
     for (; item; item = item->next) {
         if (virSecurityManagerSetAllLabel(item->securityManager, vm,
-                                          stdin_path, chardevStdioLogd,
+                                          incomingPath, chardevStdioLogd,
                                           migrated) < 0)
             goto rollback;
     }