]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Fix dynamic_ownership qemu.conf setting
authorCole Robinson <crobinso@redhat.com>
Mon, 28 Sep 2015 23:47:09 +0000 (19:47 -0400)
committerCole Robinson <crobinso@redhat.com>
Tue, 29 Sep 2015 12:26:52 +0000 (08:26 -0400)
Commit 307fb904 (Sep 10) added a 'privileged' variable when creating
the DAC driver:

@@ -153,6 +157,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
                          bool defaultConfined,
                          bool requireConfined,
                          bool dynamicOwnership,
+                         bool privileged,
                          virSecurityManagerDACChownCallback chownCallback)

But argument order is mixed up at the caller, swapping dynamicOwnership
and privileged values. This corrects the argument order

https://bugzilla.redhat.com/show_bug.cgi?id=1266628

src/qemu/qemu_driver.c

index 7025c51b01fc32b076229eb957ca0f60ab2ff230..aff191557ff1bba5ed516a0f977ade60b903022e 100644 (file)
@@ -431,8 +431,8 @@ qemuSecurityInit(virQEMUDriverPtr driver)
                                              cfg->allowDiskFormatProbing,
                                              cfg->securityDefaultConfined,
                                              cfg->securityRequireConfined,
-                                             virQEMUDriverIsPrivileged(driver),
                                              cfg->dynamicOwnership,
+                                             virQEMUDriverIsPrivileged(driver),
                                              qemuSecurityChownCallback)))
             goto error;
         if (!stack) {