[PATCH v4 04/14] qemu: Remove type from qemuBuildSecretInfoProps

[John Ferlan <jferlan@xxxxxxxxxx>]

It's just a constant "secret" string anyway

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/qemu/qemu_command.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4fdb410..9331e65 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -510,7 +510,6 @@ qemuNetworkDriveGetPort(int protocol,
 /**
  * qemuBuildSecretInfoProps:
  * @secinfo: pointer to the secret info object
- * @type: returns a pointer to a character string for object name
  * @props: json properties to return
  *
  * Build the JSON properties for the secret info type.
@@ -520,14 +519,11 @@ qemuNetworkDriveGetPort(int protocol,
  */
 static int
 qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,
-                         const char **type,
                          virJSONValuePtr *propsret)
 {
     int ret = -1;
     char *keyid = NULL;
 
-    *type = "secret";
-
     if (!(keyid = qemuDomainGetMasterKeyAlias()))
         return -1;
 
@@ -565,13 +561,12 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd,
 {
     int ret = -1;
     virJSONValuePtr props = NULL;
-    const char *type;
     char *tmp = NULL;
 
-    if (qemuBuildSecretInfoProps(secinfo, &type, &props) < 0)
+    if (qemuBuildSecretInfoProps(secinfo, &props) < 0)
         return -1;
 
-    if (!(tmp = virQEMUBuildObjectCommandlineFromJSON(type,
+    if (!(tmp = virQEMUBuildObjectCommandlineFromJSON("secret",
                                                       secinfo->s.aes.alias,
                                                       props)))
         goto cleanup;
-- 
2.5.5

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