]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: change rbd auth_supported separation character to ;
authorJosh Durgin <josh.durgin@dreamhost.com>
Tue, 1 May 2012 05:56:08 +0000 (22:56 -0700)
committerCole Robinson <crobinso@redhat.com>
Thu, 7 Jun 2012 22:05:39 +0000 (18:05 -0400)
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 d50cae33356f9ac220a5e84e9218c13806c0b246)

src/qemu/qemu_command.c
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args

index ea9431fa311cc59d9249eef94eacc9ad7ba9c89a..978424574c45e28abfc3fc8910f65b780e537185 100644 (file)
@@ -1674,7 +1674,7 @@ qemuBuildRBDString(virConnectPtr conn,
                 goto error;
             }
             virBufferEscape(opt, '\\', ":",
-                            ":key=%s:auth_supported=cephx none",
+                            ":key=%s:auth_supported=cephx\\;none",
                             base64);
             VIR_FREE(base64);
         } else {
index 1500672691581e35f9b245494ab5698913c9f515..b323e913839c5601e7f2db24602c580880285abd 100644 (file)
@@ -5,6 +5,6 @@ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
 file=rbd:pool/image:\
 id=myname:\
 key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\
-auth_supported=cephx none:\
+auth_supported=cephx\;none:\
 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