[libvirt] [PATCH 28/30] security: selinux: Restore image label for externalDataStore

[Daniel Henrique Barboza]

On 10/7/19 6:49 PM, Cole Robinson wrote:
> Rename the existing virSecuritySELinuxRestoreImageLabelInt
> to virSecuritySELinuxRestoreImageLabelSingle, 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_selinux.c | 28 ++++++++++++++++++++++++----
>   1 file changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index fd7dd080c1..c0bfb581e3 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -1747,10 +1747,10 @@ virSecuritySELinuxRestoreTPMFileLabelInt(virSecurityManagerPtr mgr,
>   
>   
>   static int
> -virSecuritySELinuxRestoreImageLabelInt(virSecurityManagerPtr mgr,
> -                                       virDomainDefPtr def,
> -                                       virStorageSourcePtr src,
> -                                       bool migrated)
> +virSecuritySELinuxRestoreImageLabelSingle(virSecurityManagerPtr mgr,
> +                                          virDomainDefPtr def,
> +                                          virStorageSourcePtr src,
> +                                          bool migrated)
>   {
>       virSecurityLabelDefPtr seclabel;
>       virSecurityDeviceLabelDefPtr disk_seclabel;
> @@ -1802,6 +1802,26 @@ virSecuritySELinuxRestoreImageLabelInt(virSecurityManagerPtr mgr,
>   }
>   
>   
> +static int
> +virSecuritySELinuxRestoreImageLabelInt(virSecurityManagerPtr mgr,
> +                                       virDomainDefPtr def,
> +                                       virStorageSourcePtr src,
> +                                       bool migrated)
> +{
> +    if (virSecuritySELinuxRestoreImageLabelSingle(mgr, def, src, migrated) < 0)
> +        return -1;
> +
> +    if (src->externalDataStore &&
> +        virSecuritySELinuxRestoreImageLabelSingle(mgr,
> +                                                  def,
> +                                                  src->externalDataStore,
> +                                                  migrated) < 0)
> +        return -1;
> +
> +    return 0;
> +}
> +
> +
>   static int
>   virSecuritySELinuxRestoreImageLabel(virSecurityManagerPtr mgr,
>                                       virDomainDefPtr def,