]> git.ipfire.org Git - thirdparty/libvirt.git/commit
qemu: Fix the command line generation for rbd auth using aes secrets
authorJohn Ferlan <jferlan@redhat.com>
Tue, 16 Aug 2016 20:50:15 +0000 (16:50 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 17 Aug 2016 12:21:39 +0000 (08:21 -0400)
commitcbdeac8898445a8225c6b34103207f3525920d54
tree3f4acdad50e5e0ad3a3a0d765d154ebf78c3ef91
parentc5c392d8a05dba4b6af818c61b62a9a2d4f00286
qemu: Fix the command line generation for rbd auth using aes secrets

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

Since libvirt still uses a legacy qemu arg format to add a disk, the
manner in which the 'password-secret' argument is passed to qemu needs
to change to prepend a 'file.' If in the future, usage of the more
modern disk format, then the prepended 'file.' can be removed.

Fix based on Jim Fehlig <jfehlig@suse.com> posting and subsequent
upstream list followups, see:

http://www.redhat.com/archives/libvir-list/2016-August/msg00777.html

for details. Introduced by commit id 'a1344f70'.

(cherry picked from commit d53d465083edeb64cc7b78249c030734c0d91c6b)

Fixed some conflicts due to upstream commits not yet present in this
maintenance branch.
src/qemu/qemu_command.c
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args