[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH v2 1/5] Revert changes to sec label parsing



On 01/25/2012 07:12 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange redhat com>
> 
> Revert parsing changes:
> 
>   commit 302fe95ffa1bc5f1c61c0beb31a1adfbc38c668e
>   Author: Eric Blake <eblake redhat com>
>   Date:   Wed Jan 4 16:01:24 2012 -0700
> 
>     seclabel: fix regression in libvirtd restart
> 
>   commit b43432931aef92325920953ff92beabfbe5224c8
>   Author: Eric Blake <eblake redhat com>
>   Date:   Thu Dec 22 17:47:50 2011 -0700
> 
>     seclabel: allow a seclabel override on a disk src
> 
> These two commits changed the sec label parsing code so that
> the same code dealt with both the VM level sec label, and the
> per device label. Unfortunately, as we add more options to the
> VM level sec label, the logic required to use the same parsing
> code for the per device label becomes unintelligible.
> 
> * src/conf/domain_conf.c: Remove support for parsing per
>   device sec labels
> ---
>  src/conf/domain_conf.c |  190 ++++++++++++-----------------------------------
>  1 files changed, 49 insertions(+), 141 deletions(-)

ACK.  The test suite fails on this patch (which could affect 'git
bisect'), but that is to be expected, and remedied shortly by the next
patch.

> +++ b/src/conf/domain_conf.c
> @@ -1,7 +1,7 @@
>  /*
>   * domain_conf.c: domain XML processing
>   *
> - * Copyright (C) 2006-2012 Red Hat, Inc.
> + * Copyright (C) 2006-2011 Red Hat, Inc.

This particular hunk should either be omitted from this patch, or
restored in the next patch.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]