NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Remove qemuBuildRBDSecinfoURI

Browse Source 
Merge the code into the only caller.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-22 13:32:06 +02:00
parent 0151c092fb
commit f147634a38
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_command.c
View File

@ -748,31 +748,6 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd,
} }
/* qemuBuildRBDSecinfoURI:
* @uri: Pointer to the URI structure to add to
* @secinfo: Pointer to the secret info data (if present)
*
* If we have a secinfo, then build the command line options for
* the secret info for the RBD network storage. Assumption for this
* is both username and secret exist for plaintext
*
* Returns 0 on success or if no secinfo,
* -1 and error message if fail to add secret information
*/
static int
qemuBuildRBDSecinfoURI(virBuffer *buf,
qemuDomainSecretInfo *secinfo)
{
if (!secinfo)
virBufferAddLit(buf, ":auth_supported=none");
else
virBufferEscape(buf, '\\', ":", ":id=%s:auth_supported=cephx\\;none",
secinfo->username);
return 0;
}
/* qemuBuildTLSx509BackendProps: /* qemuBuildTLSx509BackendProps:
* @tlspath: path to the TLS credentials * @tlspath: path to the TLS credentials
* @listen: boolean listen for client or server setting * @listen: boolean listen for client or server setting
@ -970,8 +945,11 @@ qemuBuildNetworkDriveStr(virStorageSource *src,
if (src->snapshot) if (src->snapshot)
virBufferEscape(&buf, '\\', ":", "@%s", src->snapshot); virBufferEscape(&buf, '\\', ":", "@%s", src->snapshot);
if (qemuBuildRBDSecinfoURI(&buf, secinfo) < 0) if (!secinfo)
return NULL; virBufferAddLit(&buf, ":auth_supported=none");
else
virBufferEscape(&buf, '\\', ":", ":id=%s:auth_supported=cephx\\;none",
secinfo->username);
if (src->nhosts > 0) { if (src->nhosts > 0) {
virBufferAddLit(&buf, ":mon_host="); virBufferAddLit(&buf, ":mon_host=");