External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove type from qemuBuildSecretInfoProps

Browse Source 
It's just a constant "secret" string anyway
This commit is contained in:
John Ferlan 2016-06-22 06:10:59 -04:00
parent b95965c4f8
commit c8c3484b46
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_command.c
View File

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