[libvirt] [PATCH] qemu: fix qemu.conf security_driver

[Daniel P. Berrange]

On Wed, Aug 10, 2016 at 10:37:25AM -0400, Cole Robinson wrote:
> Since a9331394 (first release v2.1.0), specifying a manual
> security_driver setting in qemu.conf causes the daemon to fail to
> start, erroring with 'Duplicate security driver X'.
> 
> The duplicate checking was incorrectly comparing every entry
> against itself, guaranteeing a false positive.
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=1365607
> ---
>  src/qemu/qemu_conf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
> index b51f36f..7b971f1 100644
> --- a/src/qemu/qemu_conf.c
> +++ b/src/qemu/qemu_conf.c
> @@ -436,7 +436,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
>          goto cleanup;
>  
>      for (i = 0; cfg->securityDriverNames && cfg->securityDriverNames[i] != NULL; i++) {
> -        for (j = i; cfg->securityDriverNames[j] != NULL; j++) {
> +        for (j = i + 1; cfg->securityDriverNames[j] != NULL; j++) {
>              if (STREQ(cfg->securityDriverNames[i],
>                        cfg->securityDriverNames[j])) {
>                  virReportError(VIR_ERR_CONF_SYNTAX,

ACK


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|