openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Daniel P. Berrange 2016-09-12 15:49:28 +01:00
parent 2f6b750eca
commit 92513bc23a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -692,7 +692,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
*/
int
qemuBuildTLSx509BackendProps(const char *tlspath,
bool listen,
bool isListen,
bool verifypeer,
virQEMUCapsPtr qemuCaps,
virJSONValuePtr *propsret)
@ -714,7 +714,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
if (virJSONValueObjectCreate(propsret,
"s:dir", path,
"s:endpoint", (listen ? "server": "client"),
"s:endpoint", (isListen ? "server": "client"),
"b:verify-peer", verifypeer,
NULL) < 0)
goto cleanup;
@ -743,7 +743,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
static int
qemuBuildTLSx509CommandLine(virCommandPtr cmd,
const char *tlspath,
bool listen,
bool isListen,
bool verifypeer,
const char *inalias,
virQEMUCapsPtr qemuCaps)
@ -753,7 +753,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd,
virJSONValuePtr props = NULL;
char *tmp = NULL;
if (qemuBuildTLSx509BackendProps(tlspath, listen, verifypeer,
if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer,
qemuCaps, &props) < 0)
return -1;

2
src/qemu/qemu_command.h
View File

@ -67,7 +67,7 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,
/* Generate the object properties for a tls-creds-x509 */
int qemuBuildTLSx509BackendProps(const char *tlspath,
bool listen,
bool isListen,
bool verifypeer,
virQEMUCapsPtr qemuCaps,
virJSONValuePtr *propsret);