[PATCH 6/9] security: rename virSecurityDACSetImageLabelInternal to virSecurityDACSetImageLabelSingle

Peng Liang liangpeng10 at huawei.com
Mon Aug 23 02:41:17 UTC 2021


virSecurityDACSetImageLabelInt will be added in the next patch, so
rename virSecurityDACSetImageLabelInternal to
virSecurityDACSetImageLabelSingle to avoid confusion and keep consistent
with virSecurityDACRestoreImageLabelInt and
virSecurityDACRestoreImageLabelSingle.

Signed-off-by: Peng Liang <liangpeng10 at huawei.com>
---
 src/security/security_dac.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 217fed203063..b16552b2559e 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -863,11 +863,11 @@ virSecurityDACRestoreFileLabel(virSecurityManager *mgr,
 
 
 static int
-virSecurityDACSetImageLabelInternal(virSecurityManager *mgr,
-                                    virDomainDef *def,
-                                    virStorageSource *src,
-                                    virStorageSource *parent,
-                                    bool isChainTop)
+virSecurityDACSetImageLabelSingle(virSecurityManager *mgr,
+                                  virDomainDef *def,
+                                  virStorageSource *src,
+                                  virStorageSource *parent,
+                                  bool isChainTop)
 {
     virSecurityLabelDef *secdef;
     virSecurityDeviceLabelDef *disk_seclabel;
@@ -949,7 +949,7 @@ virSecurityDACSetImageLabelRelative(virSecurityManager *mgr,
     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
         const bool isChainTop = flags & VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP;
 
-        if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent, isChainTop) < 0)
+        if (virSecurityDACSetImageLabelSingle(mgr, def, n, parent, isChainTop) < 0)
             return -1;
 
         if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
-- 
2.31.1





More information about the libvir-list mailing list