]> git.ipfire.org Git - thirdparty/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, 6 Oct 2015 19:17:00 +0000 (15:17 -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
(cherry picked from commit 68572de8228e3971174a83c227fcb018d6f684c7)

src/qemu/qemu_driver.c

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