From ca2765a2a09014c7759e051ba70ad6fa038584a1 Mon Sep 17 00:00:00 2001
From: Wido den Hollander <wido@widodh.nl>
Date: Mon, 25 Jun 2012 17:44:01 +0200
Subject: [PATCH] qemu: Always set auth_supported for Ceph disks.

Recently the Ceph project defaulted auth_supported from 'none' to 'cephx'.

When no auth information was set for Ceph disks this would lead to librados defaulting to
'cephx', but there would be no additional authorization information.

We now explicitly set auth_supported to none when passing down arguments to Qemu.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
(cherry picked from commit ccb94785007d33365d49dd566e194eb0a022148d)

(crobinso: Add Wido to AUTHORS)
---
 AUTHORS                 | 1 +
 src/qemu/qemu_command.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 57e124d582..76fa3cd2d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -240,6 +240,7 @@ Patches have also been contributed by:
   Viktor Mihajlovski   <mihajlov@linux.vnet.ibm.com>
   Thang Pham           <thang.pham@us.ibm.com>
   Eiichi Tsukata       <eiichi.tsukata.xh@hitachi.com>
+  Wido den Hollander   <wido@widodh.nl>
 
   [....send patches to get your name here....]
 
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index af5ff5b929..4d518b23fc 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1775,6 +1775,8 @@ qemuBuildRBDString(virConnectPtr conn,
                             disk->auth.username);
             goto error;
         }
+    } else {
+        virBufferAddLit(opt, ":auth_supported=none");
     }
 
     if (disk->nhosts > 0) {