From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Tue, 1 May 2012 05:56:08 +0000 (-0700)
Subject: qemu: change rbd auth_supported separation character to ;
X-Git-Tag: v0.9.12-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d50cae33356f9ac220a5e84e9218c13806c0b246;p=thirdparty%2Flibvirt.git

qemu: change rbd auth_supported separation character to ;

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>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 45cd41749d..070d13ecec 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -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 {
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
index 1500672691..b323e91383 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
@@ -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