security: Drop virSecurity(DAC|SELinux)SetImageLabelRelative()

The single caller for each function passes the same value
for @src and @parent, which means that we don't really need
the additional API.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 9c24a1c4a8c6e169fea2afdbb53903a4e19feea0..567be4bd230667592790684daf24d88f8dbbd931 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -939,12 +939,12 @@ virSecurityDACSetImageLabelInternal(virSecurityManager *mgr,
 
 
 static int
-virSecurityDACSetImageLabelRelative(virSecurityManager *mgr,
-                                    virDomainDef *def,
-                                    virStorageSource *src,
-                                    virStorageSource *parent,
-                                    virSecurityDomainImageLabelFlags flags)
+virSecurityDACSetImageLabel(virSecurityManager *mgr,
+                            virDomainDef *def,
+                            virStorageSource *src,
+                            virSecurityDomainImageLabelFlags flags)
 {
+    virStorageSource *parent = src;
     virStorageSource *n;
 
     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
@@ -962,15 +962,6 @@ virSecurityDACSetImageLabelRelative(virSecurityManager *mgr,
     return 0;
 }
 
-static int
-virSecurityDACSetImageLabel(virSecurityManager *mgr,
-                            virDomainDef *def,
-                            virStorageSource *src,
-                            virSecurityDomainImageLabelFlags flags)
-{
-    return virSecurityDACSetImageLabelRelative(mgr, def, src, src, flags);
-}
-
 static int
 virSecurityDACRestoreImageLabelInt(virSecurityManager *mgr,
                                    virDomainDef *def,

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index d491435ae17694e7e4a25bc5e8bb2d6f11415b22..b49af26e4935d9d6bfe3e1d03fc5555abcb2ff55 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1980,12 +1980,12 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManager *mgr,
 
 
 static int
-virSecuritySELinuxSetImageLabelRelative(virSecurityManager *mgr,
-                                        virDomainDef *def,
-                                        virStorageSource *src,
-                                        virStorageSource *parent,
-                                        virSecurityDomainImageLabelFlags flags)
+virSecuritySELinuxSetImageLabel(virSecurityManager *mgr,
+                               virDomainDef *def,
+                               virStorageSource *src,
+                               virSecurityDomainImageLabelFlags flags)
 {
+    virStorageSource *parent = src;
     virStorageSource *n;
 
     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
@@ -2004,15 +2004,6 @@ virSecuritySELinuxSetImageLabelRelative(virSecurityManager *mgr,
 }
 
 
-static int
-virSecuritySELinuxSetImageLabel(virSecurityManager *mgr,
-                                virDomainDef *def,
-                                virStorageSource *src,
-                                virSecurityDomainImageLabelFlags flags)
-{
-    return virSecuritySELinuxSetImageLabelRelative(mgr, def, src, src, flags);
-}
-
 struct virSecuritySELinuxMoveImageMetadataData {
     virSecurityManager *mgr;
     const char *src;