From: John Ferlan <jferlan@redhat.com>
Date: Wed, 22 Jun 2016 10:10:59 +0000 (-0400)
Subject: qemu: Remove type from qemuBuildSecretInfoProps
X-Git-Tag: v2.0.0-rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8c3484b466e57248f3b7b0533152d47264293d0;p=thirdparty%2Flibvirt.git

qemu: Remove type from qemuBuildSecretInfoProps

It's just a constant "secret" string anyway
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0638a868af..fbb5fdb938 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;