[libvirt] [PATCH 22/30] security: dac: Restore image label for externalDataStore
Daniel Henrique Barboza
danielhb413 at gmail.com
Thu Oct 10 15:56:22 UTC 2019
On 10/7/19 6:49 PM, Cole Robinson wrote:
> Rename the existing virSecurityDACRestoreImageLabelInt
> to virSecurityDACRestoreImageLabelSingle, and extend the new
> ImageLabelInt handle externalDataStore
>
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
> src/security/security_dac.c | 28 ++++++++++++++++++++++++----
> 1 file changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/src/security/security_dac.c b/src/security/security_dac.c
> index 6d0c8a9b1c..befa388791 100644
> --- a/src/security/security_dac.c
> +++ b/src/security/security_dac.c
> @@ -954,10 +954,10 @@ virSecurityDACSetImageLabel(virSecurityManagerPtr mgr,
>
>
> static int
> -virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr,
> - virDomainDefPtr def,
> - virStorageSourcePtr src,
> - bool migrated)
> +virSecurityDACRestoreImageLabelSingle(virSecurityManagerPtr mgr,
> + virDomainDefPtr def,
> + virStorageSourcePtr src,
> + bool migrated)
> {
> virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
> virSecurityLabelDefPtr secdef;
> @@ -1008,6 +1008,26 @@ virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr,
> }
>
>
> +static int
> +virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr,
> + virDomainDefPtr def,
> + virStorageSourcePtr src,
> + bool migrated)
> +{
> + if (virSecurityDACRestoreImageLabelSingle(mgr, def, src, migrated) < 0)
> + return -1;
> +
> + if (src->externalDataStore &&
> + virSecurityDACRestoreImageLabelSingle(mgr,
> + def,
> + src->externalDataStore,
> + migrated) < 0)
> + return -1;
> +
> + return 0;
> +}
> +
> +
> static int
> virSecurityDACRestoreImageLabel(virSecurityManagerPtr mgr,
> virDomainDefPtr def,
More information about the libvir-list
mailing list