29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
|
commit 856965b36246b26002af409262846317477ea631
|
||
|
|
Author: Cole Robinson <crobinso@redhat.com>
|
||
|
|
Date: Wed Aug 10 10:32:03 2016 -0400
|
||
|
|
|
||
|
|
qemu: fix qemu.conf security_driver
|
||
|
|
|
||
|
|
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
|
||
|
|
|
||
|
|
Index: libvirt-2.1.0/src/qemu/qemu_conf.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-2.1.0.orig/src/qemu/qemu_conf.c
|
||
|
|
+++ libvirt-2.1.0/src/qemu/qemu_conf.c
|
||
|
|
@@ -431,7 +431,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD
|
||
|
|
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,
|