External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 22:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small guestfwd code cleanup

Browse Source 
* src/qemu/qemu_conf.c: Remove and inline qemudBuildCommandLineChrDevTargetStr
This commit is contained in:
Matthew Booth 2009-11-13 16:05:27 +01:00 committed by Daniel Veillard
parent ddfd21f815
commit da82b03fb0
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_conf.c
View File

@ -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,
virBufferPtr buf)
{
@ -2205,7 +2182,14 @@ int qemudBuildCommandLine(virConnectPtr conn,
ADD_ARG_LIT("-chardev");
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))
goto error;