diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 892cc3bd596989e95de8d6f431f095c0b0ab0ba9..c06613a0bdbec6a32ccf30a342001a1b20302635 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 f7405e0c6c8621277593b29468069eb0c53c4f04..f76404e1ac2513b75822d563f2b0bea973199a07 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 08e68939cdc924e12f2bd849946aee73b1147df0..4cf26eca8a24b5208fc799edd95625d6fd0588d4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3925,7 +3925,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))) { @@ -4185,7 +4185,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; }