External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 14:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: change rbd auth_supported separation character to ;

Browse Source 
This works with newer qemu that doesn't allow escaping spaces.
It's backwards compatible as well.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
(cherry picked from commit d50cae3335)
This commit is contained in:
Josh Durgin 2012-04-30 22:56:08 -07:00 committed by Cole Robinson
parent 6bbfd92d22
commit 45e60ff0f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_command.c
View File

@ -1674,7 +1674,7 @@ qemuBuildRBDString(virConnectPtr conn,
goto error; goto error;
} }
virBufferEscape(opt, '\\', ":", virBufferEscape(opt, '\\', ":",
":key=%s:auth_supported=cephx none", ":key=%s:auth_supported=cephx\\;none",
base64); base64);
VIR_FREE(base64); VIR_FREE(base64);
} else { } else {

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
View File

@ -5,6 +5,6 @@ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
file=rbd:pool/image:\ file=rbd:pool/image:\
id=myname:\ id=myname:\
key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\
auth_supported=cephx none:\ auth_supported=cephx\;none:\
mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,\ mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,\
if=virtio,format=raw -net none -serial none -parallel none -usb if=virtio,format=raw -net none -serial none -parallel none -usb