]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Remove type from qemuBuildSecretInfoProps
authorJohn Ferlan <jferlan@redhat.com>
Wed, 22 Jun 2016 10:10:59 +0000 (06:10 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Fri, 24 Jun 2016 17:04:38 +0000 (13:04 -0400)
It's just a constant "secret" string anyway

src/qemu/qemu_command.c

index 0638a868af7ac5c15a34a6fb458440c4b22ad548..fbb5fdb938affa87bbf876bbbb75d4a8131f81b8 100644 (file)
@@ -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;