提交 92513bc2 编写于 作者: D Daniel P. Berrange

qemu: avoid parameter named 'listen'

previous commit:

  commit 2c322378
  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: NDaniel P. Berrange <berrange@redhat.com>
上级 2f6b750e
......@@ -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;
......
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册