security: drop virSecurityDACRestoreImageLabelSingle()

[libvirt PATCH] security: drop virSecurityDACRestoreImageLabelSingle()

Andrea Bolognani posted 1 patch 5 months, 1 week ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20231121154659.61319-1-abologna@redhat.com

src/security/security_dac.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)

Expand all Fold all

[libvirt PATCH] security: drop virSecurityDACRestoreImageLabelSingle()

Posted by Andrea Bolognani 5 months, 1 week ago

It only has a single, trivial caller.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/security/security_dac.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index c07e488db7..35b9b56c66 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -972,10 +972,10 @@ virSecurityDACSetImageLabel(virSecurityManager *mgr,
 }
 
 static int
-virSecurityDACRestoreImageLabelSingle(virSecurityManager *mgr,
-                                      virDomainDef *def,
-                                      virStorageSource *src,
-                                      bool migrated)
+virSecurityDACRestoreImageLabelInt(virSecurityManager *mgr,
+                                   virDomainDef *def,
+                                   virStorageSource *src,
+                                   bool migrated)
 {
     virSecurityDACData *priv = virSecurityManagerGetPrivateData(mgr);
     virSecurityLabelDef *secdef;
@@ -1047,19 +1047,6 @@ virSecurityDACRestoreImageLabelSingle(virSecurityManager *mgr,
 }
 
 
-static int
-virSecurityDACRestoreImageLabelInt(virSecurityManager *mgr,
-                                   virDomainDef *def,
-                                   virStorageSource *src,
-                                   bool migrated)
-{
-    if (virSecurityDACRestoreImageLabelSingle(mgr, def, src, migrated) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 static int
 virSecurityDACRestoreImageLabel(virSecurityManager *mgr,
                                 virDomainDef *def,
-- 
2.42.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

Re: [libvirt PATCH] security: drop virSecurityDACRestoreImageLabelSingle()

Posted by Peter Krempa 5 months, 1 week ago

On Tue, Nov 21, 2023 at 16:46:59 +0100, Andrea Bolognani wrote:
> It only has a single, trivial caller.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  src/security/security_dac.c | 21 ++++-----------------
>  1 file changed, 4 insertions(+), 17 deletions(-)

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org