From aa736c098e47a57a45c1b977bb9acfd998840a41 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 7 Oct 2019 16:12:22 -0400 Subject: [PATCH] security: dac: break out SetImageLabelRelative This will be used for recursing into externalDataStore Reviewed-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik Signed-off-by: Cole Robinson --- src/security/security_dac.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 2266059819..3edfb8f9f4 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -936,15 +936,16 @@ virSecurityDACSetImageLabelInternal(virSecurityManagerPtr mgr, static int -virSecurityDACSetImageLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags) +virSecurityDACSetImageLabelRelative(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virStorageSourcePtr src, + virStorageSourcePtr parent, + virSecurityDomainImageLabelFlags flags) { virStorageSourcePtr n; for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) { - if (virSecurityDACSetImageLabelInternal(mgr, def, n, src) < 0) + if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent) < 0) return -1; if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN)) @@ -954,6 +955,14 @@ virSecurityDACSetImageLabel(virSecurityManagerPtr mgr, return 0; } +static int +virSecurityDACSetImageLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virStorageSourcePtr src, + virSecurityDomainImageLabelFlags flags) +{ + return virSecurityDACSetImageLabelRelative(mgr, def, src, src, flags); +} static int virSecurityDACRestoreImageLabelSingle(virSecurityManagerPtr mgr, -- 2.47.2