[libvirt] [PATCH 3/2] Skip labelling if no src path present

Daniel P. Berrange berrange at redhat.com
Fri Jul 3 10:04:16 UTC 2009


On Fri, Jul 03, 2009 at 10:43:12AM +0100, Mark McLoughlin wrote:
> Fixes startup of guest's with sourceless cdrom devices.
> 
> Patch originally posted here:
> 
>   https://bugzilla.redhat.com/499569
> 
> but never sent upstream.
> 
> Signed-off-by: Mark McLoughlin <markmc at redhat.com>
> ---
>  src/security_selinux.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)


ACK.

> 
> diff --git a/src/security_selinux.c b/src/security_selinux.c
> index 174dd57..80c1c85 100644
> --- a/src/security_selinux.c
> +++ b/src/security_selinux.c
> @@ -380,6 +380,9 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
>  {
>      const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
>  
> +    if (!disk->src)
> +        return 0;
> +
>      if (disk->shared) {
>          return SELinuxSetFilecon(conn, disk->src, default_image_context);
>      } else if (disk->readonly) {
> -- 
> 1.6.2.5
> 
> --
> Libvir-list mailing list
> Libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list

-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|




More information about the libvir-list mailing list