mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-24 14:45:24 +00:00
qemu: avoid parameter named 'listen'
previous commit:
commit 2c3223785c
Author: John Ferlan <jferlan@redhat.com>
Date: Mon Jun 13 12:30:34 2016 -0400
qemu: Add the ability to hotplug the TLS X.509 environment
added a parameter "bool listen" in some methods. This
unfortunately clashes with the listen() method, causing
compile failures on certain platforms (RHEL-6 for example)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
2f6b750eca
commit
92513bc23a
@ -692,7 +692,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
|
|||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
qemuBuildTLSx509BackendProps(const char *tlspath,
|
qemuBuildTLSx509BackendProps(const char *tlspath,
|
||||||
bool listen,
|
bool isListen,
|
||||||
bool verifypeer,
|
bool verifypeer,
|
||||||
virQEMUCapsPtr qemuCaps,
|
virQEMUCapsPtr qemuCaps,
|
||||||
virJSONValuePtr *propsret)
|
virJSONValuePtr *propsret)
|
||||||
@ -714,7 +714,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
|
|||||||
|
|
||||||
if (virJSONValueObjectCreate(propsret,
|
if (virJSONValueObjectCreate(propsret,
|
||||||
"s:dir", path,
|
"s:dir", path,
|
||||||
"s:endpoint", (listen ? "server": "client"),
|
"s:endpoint", (isListen ? "server": "client"),
|
||||||
"b:verify-peer", verifypeer,
|
"b:verify-peer", verifypeer,
|
||||||
NULL) < 0)
|
NULL) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@ -743,7 +743,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
|
|||||||
static int
|
static int
|
||||||
qemuBuildTLSx509CommandLine(virCommandPtr cmd,
|
qemuBuildTLSx509CommandLine(virCommandPtr cmd,
|
||||||
const char *tlspath,
|
const char *tlspath,
|
||||||
bool listen,
|
bool isListen,
|
||||||
bool verifypeer,
|
bool verifypeer,
|
||||||
const char *inalias,
|
const char *inalias,
|
||||||
virQEMUCapsPtr qemuCaps)
|
virQEMUCapsPtr qemuCaps)
|
||||||
@ -753,7 +753,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd,
|
|||||||
virJSONValuePtr props = NULL;
|
virJSONValuePtr props = NULL;
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
if (qemuBuildTLSx509BackendProps(tlspath, listen, verifypeer,
|
if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer,
|
||||||
qemuCaps, &props) < 0)
|
qemuCaps, &props) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,
|
|||||||
|
|
||||||
/* Generate the object properties for a tls-creds-x509 */
|
/* Generate the object properties for a tls-creds-x509 */
|
||||||
int qemuBuildTLSx509BackendProps(const char *tlspath,
|
int qemuBuildTLSx509BackendProps(const char *tlspath,
|
||||||
bool listen,
|
bool isListen,
|
||||||
bool verifypeer,
|
bool verifypeer,
|
||||||
virQEMUCapsPtr qemuCaps,
|
virQEMUCapsPtr qemuCaps,
|
||||||
virJSONValuePtr *propsret);
|
virJSONValuePtr *propsret);
|
||||||
|
Loading…
Reference in New Issue
Block a user