[PATCH 03/38] qemu: domain: Rename qemuDomainSecretDiskCapable

[Peter Krempa <pkrempa@xxxxxxxxxx>]

The function checks whether the storage source requires authentication
secret setup. Rename it accordingly.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_domain.c  | 4 ++--
 src/qemu/qemu_domain.h  | 2 +-
 src/qemu/qemu_hotplug.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8a93223633..b454edd0e4 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1459,7 +1459,7 @@ qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk)


 bool
-qemuDomainSecretDiskCapable(virStorageSourcePtr src)
+qemuDomainStorageSourceHasAuth(virStorageSourcePtr src)
 {
     if (!virStorageSourceIsEmpty(src) &&
         virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_NETWORK &&
@@ -1505,7 +1505,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
                                      const char *encalias)
 {
     qemuDomainStorageSourcePrivatePtr srcPriv;
-    bool hasAuth = qemuDomainSecretDiskCapable(src);
+    bool hasAuth = qemuDomainStorageSourceHasAuth(src);
     bool hasEnc = qemuDomainDiskHasEncryptionSecret(src);

     if (!hasAuth && !hasEnc)
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index f7405e0c6c..f76404e1ac 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -839,7 +839,7 @@ void qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo)
 void qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk)
     ATTRIBUTE_NONNULL(1);

-bool qemuDomainSecretDiskCapable(virStorageSourcePtr src)
+bool qemuDomainStorageSourceHasAuth(virStorageSourcePtr src)
     ATTRIBUTE_NONNULL(1);

 bool qemuDomainDiskHasEncryptionSecret(virStorageSourcePtr src)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index b4bbe62c75..2899f49fff 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3854,7 +3854,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
      * been removed during cleanup of qemuProcessLaunch. Likewise, libvirtd
      * restart wouldn't have them, so no assumption can be made. */
     if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET) &&
-        qemuDomainSecretDiskCapable(disk->src)) {
+        qemuDomainStorageSourceHasAuth(disk->src)) {

         if (!(objAlias =
               qemuDomainGetSecretAESAlias(disk->info.alias, false))) {
@@ -4109,7 +4109,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
          * attempt to remove the object as well. */
         if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI &&
             virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET) &&
-            qemuDomainSecretDiskCapable(iscsisrc->src)) {
+            qemuDomainStorageSourceHasAuth(iscsisrc->src)) {
             if (!(objAlias = qemuDomainGetSecretAESAlias(hostdev->info->alias, false)))
                 goto cleanup;
         }
-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list