[libvirt] [PATCH v2 RESEND] qemu: change rbd auth_supported separation character to ;

[Daniel P. Berrange]

On Mon, Apr 30, 2012 at 10:56:08PM -0700, Josh Durgin wrote:
> This works with newer qemu that doesn't allow escaping spaces.
> It's backwards compatible as well.
> 
> Signed-off-by: Josh Durgin <josh.durgin at dreamhost.com>
> ---
>  src/qemu/qemu_command.c                            |    2 +-
>  .../qemuxml2argv-disk-drive-network-rbd-auth.args  |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 45cd417..070d13e 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 1500672..b323e91 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

ACK

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|