提交 da82b03f 编写于 作者: M Matthew Booth 提交者: Daniel Veillard

Small guestfwd code cleanup

* src/qemu/qemu_conf.c: Remove and inline qemudBuildCommandLineChrDevTargetStr
上级 ddfd21f8
...@@ -1495,29 +1495,6 @@ static void qemudBuildCommandLineChrDevChardevStr(virDomainChrDefPtr dev, ...@@ -1495,29 +1495,6 @@ static void qemudBuildCommandLineChrDevChardevStr(virDomainChrDefPtr dev,
} }
} }
static int qemudBuildCommandLineChrDevTargetStr(virDomainChrDefPtr dev,
const char *const id,
virBufferPtr buf)
{
int ret = 0;
const char *addr = NULL;
int port;
switch (dev->targetType) {
case VIR_DOMAIN_CHR_TARGET_TYPE_GUESTFWD:
addr = virSocketFormatAddr(dev->target.addr);
port = virSocketGetPort(dev->target.addr);
virBufferVSprintf(buf, "user,guestfwd=tcp:%s:%i-chardev:%s",
addr, port, id);
VIR_FREE(addr);
break;
}
return ret;
}
static void qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, static void qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev,
virBufferPtr buf) virBufferPtr buf)
{ {
...@@ -2205,7 +2182,14 @@ int qemudBuildCommandLine(virConnectPtr conn, ...@@ -2205,7 +2182,14 @@ int qemudBuildCommandLine(virConnectPtr conn,
ADD_ARG_LIT("-chardev"); ADD_ARG_LIT("-chardev");
ADD_ARG(virBufferContentAndReset(&buf)); ADD_ARG(virBufferContentAndReset(&buf));
qemudBuildCommandLineChrDevTargetStr(channel, id, &buf); const char *addr = virSocketFormatAddr(channel->target.addr);
int port = virSocketGetPort(channel->target.addr);
virBufferVSprintf(&buf, "user,guestfwd=tcp:%s:%i-chardev:%s",
addr, port, id);
VIR_FREE(addr);
if (virBufferError(&buf)) if (virBufferError(&buf))
goto error; goto error;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册