[libvirt] [PATCH 6/7] qemu: Remove authdef from secret setup

[John Ferlan]

Rather than pass authdef, pass the 'authdef->username' and the
'&authdef->seclookupdef'

Note that a username may be NULL.

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 src/qemu/qemu_domain.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index ccd5ce8..c8f6d29 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -808,7 +808,8 @@ qemuDomainHostdevPrivateDispose(void *obj)
  * @conn: Pointer to connection
  * @secinfo: Pointer to secret info
  * @secretUsageType: The virSecretUsageType
- * @authdef: Pointer to auth data
+ * @username: username to use for authentication (may be NULL)
+ * @seclookupdef: Pointer to seclookupdef data
  *
  * Taking a secinfo, fill in the plaintext information
  *
@@ -818,14 +819,14 @@ static int
 qemuDomainSecretPlainSetup(virConnectPtr conn,
                            qemuDomainSecretInfoPtr secinfo,
                            virSecretUsageType secretUsageType,
-                           virStorageAuthDefPtr authdef)
+                           const char *username,
+                           virSecretLookupTypeDefPtr seclookupdef)
 {
     secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN;
-    if (VIR_STRDUP(secinfo->s.plain.username, authdef->username) < 0)
+    if (VIR_STRDUP(secinfo->s.plain.username, username) < 0)
         return -1;
 
-    return virSecretGetSecretString(conn, &authdef->seclookupdef,
-                                    secretUsageType,
+    return virSecretGetSecretString(conn, seclookupdef, secretUsageType,
                                     &secinfo->s.plain.secret,
                                     &secinfo->s.plain.secretlen);
 }
@@ -837,7 +838,8 @@ qemuDomainSecretPlainSetup(virConnectPtr conn,
  * @secinfo: Pointer to secret info
  * @srcalias: Alias of the disk/hostdev used to generate the secret alias
  * @secretUsageType: The virSecretUsageType
- * @authdef: Pointer to auth data
+ * @username: username to use for authentication (may be NULL)
+ * @seclookupdef: Pointer to seclookupdef data
  *
  * Taking a secinfo, fill in the AES specific information using the
  *
@@ -849,7 +851,8 @@ qemuDomainSecretAESSetup(virConnectPtr conn,
                          qemuDomainSecretInfoPtr secinfo,
                          const char *srcalias,
                          virSecretUsageType secretUsageType,
-                         virStorageAuthDefPtr authdef)
+                         const char *username,
+                         virSecretLookupTypeDefPtr seclookupdef)
 {
     int ret = -1;
     uint8_t *raw_iv = NULL;
@@ -860,7 +863,7 @@ qemuDomainSecretAESSetup(virConnectPtr conn,
     size_t ciphertextlen = 0;
 
     secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
-    if (VIR_STRDUP(secinfo->s.aes.username, authdef->username) < 0)
+    if (VIR_STRDUP(secinfo->s.aes.username, username) < 0)
         return -1;
 
     if (!(secinfo->s.aes.alias = qemuDomainGetSecretAESAlias(srcalias)))
@@ -875,7 +878,7 @@ qemuDomainSecretAESSetup(virConnectPtr conn,
         goto cleanup;
 
     /* Grab the unencoded secret */
-    if (virSecretGetSecretString(conn, &authdef->seclookupdef, secretUsageType,
+    if (virSecretGetSecretString(conn, seclookupdef, secretUsageType,
                                  &secret, &secretlen) < 0)
         goto cleanup;
 
@@ -910,7 +913,8 @@ qemuDomainSecretAESSetup(virConnectPtr conn,
  * @secinfo: Pointer to secret info
  * @srcalias: Alias of the disk/hostdev used to generate the secret alias
  * @secretUsageType: The virSecretUsageType
- * @authdef: Pointer to auth data
+ * @username: username to use for authentication (may be NULL)
+ * @seclookupdef: Pointer to seclookupdef data
  *
  * If we have the encryption API present and can support a secret object, then
  * build the AES secret; otherwise, build the Plain secret. This is the magic
@@ -925,17 +929,19 @@ qemuDomainSecretSetup(virConnectPtr conn,
                       qemuDomainSecretInfoPtr secinfo,
                       const char *srcalias,
                       virSecretUsageType secretUsageType,
-                      virStorageAuthDefPtr authdef)
+                      const char *username,
+                      virSecretLookupTypeDefPtr seclookupdef)
 {
     if (virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC) &&
         virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET) &&
         secretUsageType == VIR_SECRET_USAGE_TYPE_CEPH) {
         if (qemuDomainSecretAESSetup(conn, priv, secinfo, srcalias,
-                                     secretUsageType, authdef) < 0)
+                                     secretUsageType, username,
+                                     seclookupdef) < 0)
             return -1;
     } else {
         if (qemuDomainSecretPlainSetup(conn, secinfo, secretUsageType,
-                                       authdef) < 0)
+                                       username, seclookupdef) < 0)
             return -1;
     }
     return 0;
@@ -1031,7 +1037,8 @@ qemuDomainSecretDiskPrepare(virConnectPtr conn,
             goto error;
 
         if (qemuDomainSecretSetup(conn, priv, secinfo, disk->info.alias,
-                                  secretUsageType, src->auth) < 0)
+                                  secretUsageType, src->auth->username,
+                                  &src->auth->seclookupdef) < 0)
             goto error;
 
         diskPriv->secinfo = secinfo;
@@ -1101,8 +1108,8 @@ qemuDomainSecretHostdevPrepare(virConnectPtr conn,
                 goto error;
 
             if (qemuDomainSecretSetup(conn, priv, secinfo, hostdev->info->alias,
-                                      secretUsageType,
-                                      iscsisrc->auth) < 0)
+                                      secretUsageType, iscsisrc->auth->username,
+                                      &iscsisrc->auth->seclookupdef) < 0)
                 goto error;
 
             hostdevPriv->secinfo = secinfo;
-- 
2.5.5