qemuDomainGetSecretAESAlias: Replace outstanding uses with qemuAliasForSecret

There are two last callers of this function. Replace them by
qemuAliasForSecret and delete qemuDomainGetSecretAESAlias.

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

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 2e466ff23f298757892a2824aa18044ca7b40603..b450bf0866bdf53916a9f73240b27a8791e63f65 100644 (file)
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -764,35 +764,6 @@ qemuDomainGetMasterKeyAlias(void)
 }
 
 
-/* qemuDomainGetSecretAESAlias:
- * @srcalias: Source alias used to generate the secret alias
- * @isLuks: True when we are generating a secret for LUKS encrypt/decrypt
- *
- * Generate and return an alias for the encrypted secret
- *
- * Returns NULL or a string containing the alias
- */
-char *
-qemuDomainGetSecretAESAlias(const char *srcalias,
-                            bool isLuks)
-{
-    char *alias;
-
-    if (!srcalias) {
-        virReportError(VIR_ERR_INVALID_ARG, "%s",
-                       _("encrypted secret alias requires valid source alias"));
-        return NULL;
-    }
-
-    if (isLuks)
-        alias = g_strdup_printf("%s-luks-secret0", srcalias);
-    else
-        alias = g_strdup_printf("%s-secret0", srcalias);
-
-    return alias;
-}
-
-
 /* qemuAliasForSecret:
  * @parentalias: alias of the parent object
  * @obj: optional sub-object of the parent device the secret is for

diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 645956d0240ce405d86822c86f8c2714f34ab265..490aa568a9c6f858fc5a99ee7abae6e6b3e30486 100644 (file)
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -83,9 +83,6 @@ char *qemuAliasFromHostdev(const virDomainHostdevDef *hostdev);
 
 char *qemuDomainGetMasterKeyAlias(void);
 
-char *qemuDomainGetSecretAESAlias(const char *srcalias,
-                                  bool isLuks);
-
 char *qemuAliasForSecret(const char *parentalias,
                          const char *obj);
 

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index e804053933fc6d4b386434324344b6e11a77b43e..47069be90072f6e0d9fb51b4dfe090296fab3fdf 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1842,7 +1842,7 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr driver,
      * secret UUID and we have a serial TCP chardev, then formulate a
      * secAlias which we'll attempt to destroy. */
     if (cfg->chardevTLSx509secretUUID &&
-        !(secAlias = qemuDomainGetSecretAESAlias(inAlias, false)))
+        !(secAlias = qemuAliasForSecret(inAlias, NULL)))
         return -1;
 
     qemuDomainObjEnterMonitor(driver, vm);

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 563180fa1e129ab8131c2e52dc3811baddbd5ce4..dd5e2ce1b62712ea28431e2d4931df3ba0221958 100644 (file)
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -1080,7 +1080,7 @@ qemuMigrationParamsResetTLS(virQEMUDriverPtr driver,
         return;
 
     tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE);
-    secAlias = qemuDomainGetSecretAESAlias(QEMU_MIGRATION_TLS_ALIAS_BASE, false);
+    secAlias = qemuAliasForSecret(QEMU_MIGRATION_TLS_ALIAS_BASE, NULL);
 
     qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, tlsAlias);
     g_clear_pointer(&QEMU_DOMAIN_PRIVATE(vm)->migSecinfo, qemuDomainSecretInfoFree);