From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 22 May 2018 07:03:02 +0000 (+0200)
Subject: qemu: domain: Reuse code when preparing hostdev auth secrets
X-Git-Tag: v4.5.0-rc1~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a2faa13447a2e37efb2419356e572cadeccc176;p=thirdparty%2Flibvirt.git

qemu: domain: Reuse code when preparing hostdev auth secrets

Use qemuDomainSecretStorageSourcePrepare in
qemuDomainSecretHostdevPrepare as it uses a virStorageSource to prepare
the authentication secret object data.

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

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9463dd45f1..892cc3bd59 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1600,22 +1600,11 @@ qemuDomainSecretHostdevPrepare(qemuDomainObjPrivatePtr priv,
         virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
         virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi;
         virStorageSourcePtr src = iscsisrc->src;
-        qemuDomainStorageSourcePrivatePtr srcPriv;
 
         if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI &&
             src->auth) {
-
-            if (!(src->privateData = qemuDomainStorageSourcePrivateNew()))
-                return -1;
-
-            srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
-
-            if (!(srcPriv->secinfo =
-                  qemuDomainSecretInfoNew(priv, hostdev->info->alias,
-                                          VIR_SECRET_USAGE_TYPE_ISCSI,
-                                          src->auth->username,
-                                          &src->auth->seclookupdef,
-                                          false)))
+            if (qemuDomainSecretStorageSourcePrepare(priv, src,
+                                                     hostdev->info->alias, NULL) < 0)
                 return -1;
         }
     }