From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 20 Dec 2021 13:22:06 +0000 (+0100)
Subject: qemuBlockStorageSourceGetRBDProps: Simplify generation of auth modes
X-Git-Tag: v8.0.0-rc1~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b58f88a919e1744518f2ecfafa9e1592c1793ab9;p=thirdparty%2Flibvirt.git

qemuBlockStorageSourceGetRBDProps: Simplify generation of auth modes

The auth mode array is static, parse it from a JSON string.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
---

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 2e606e99b4..e5ff653a60 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -881,7 +881,6 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src,
     const char *encformat;
     const char *username = NULL;
     g_autoptr(virJSONValue) authmodes = NULL;
-    g_autoptr(virJSONValue) mode = NULL;
     const char *keysecret = NULL;
 
     if (src->nhosts > 0 &&
@@ -892,14 +891,7 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src,
         username = srcPriv->secinfo->username;
         keysecret = srcPriv->secinfo->alias;
         /* the auth modes are modelled after our old command line generator */
-        authmodes = virJSONValueNewArray();
-
-        if (!(mode = virJSONValueNewString("cephx")) ||
-            virJSONValueArrayAppend(authmodes, &mode) < 0)
-            return NULL;
-
-        if (!(mode = virJSONValueNewString("none")) ||
-            virJSONValueArrayAppend(authmodes, &mode) < 0)
+        if (!(authmodes = virJSONValueFromString("[\"cephx\",\"none\"]")))
             return NULL;
     }