previous commit: commit 2c3223785c121eafbdd503f11549d7964461934f Author: John Ferlan <jferlan(a)redhat.com&gt; 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(a)redhat.com&gt; --- Pushed as a CI build fix src/qemu/qemu_command.c | 8 ++++---- src/qemu/qemu_command.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e0b0401..3a61863 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b7c59bb..0c0b8f1 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -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); -- 2.7.4