From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 6 Mar 2020 14:36:42 +0000 (+0100)
Subject: qemu: Introduce another helper for creating alias for a 'secret' object
X-Git-Tag: v6.2.0-rc1~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb2a81df21710ed8258854e0dc2b3c2e923831f2;p=thirdparty%2Flibvirt.git

qemu: Introduce another helper for creating alias for a 'secret' object

qemuAliasForSecret is meant as a replacement qemuDomainGetSecretAESAlias
with saner API. The sub-type we are creating the alias for is passed in
as a string rather than the unflexible 'isLuks' boolean.

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 95086fc65a..2e466ff23f 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -793,6 +793,23 @@ qemuDomainGetSecretAESAlias(const char *srcalias,
 }
 
 
+/* qemuAliasForSecret:
+ * @parentalias: alias of the parent object
+ * @obj: optional sub-object of the parent device the secret is for
+ *
+ * Generate alias for a secret object used by @parentalias device or one of
+ * the dependencies of the device described by @obj.
+ */
+char *
+qemuAliasForSecret(const char *parentalias,
+                   const char *obj)
+{
+    if (obj)
+        return g_strdup_printf("%s-%s-secret0", parentalias, obj);
+    else
+        return g_strdup_printf("%s-secret0", parentalias);
+}
+
 /* qemuAliasTLSObjFromSrcAlias
  * @srcAlias: Pointer to a source alias string
  *
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index ae2fce16bc..645956d024 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -86,6 +86,9 @@ char *qemuDomainGetMasterKeyAlias(void);
 char *qemuDomainGetSecretAESAlias(const char *srcalias,
                                   bool isLuks);
 
+char *qemuAliasForSecret(const char *parentalias,
+                         const char *obj);
+
 char *qemuAliasTLSObjFromSrcAlias(const char *srcAlias)
     ATTRIBUTE_NONNULL(1);