External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 18:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix serial/parallel virtual devices over tcp, unix and telnet

Browse Source
This commit is contained in:
Guido Günther 2008-12-12 09:39:31 +00:00
parent f998f82598
commit 2ddb440cbb
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Fri Dec 12 10:28:41 CET 2008 Guido Günther <agx@sigxcpu.org>
Fix serial/parallel virtual devices over tcp, unix and telnet
* src/qemu_conf.c (qemudBuildCommandLineChrDevStr): use
"server,nowait" instead of "listen" for tcp and unix sockets. Use
"nowait" for telnet too.
* tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args: adjust
testcase accordingly.
* tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args:
likewise.
Fri Dec 12 08:54:40 CET 2008 Daniel Veillard <veillard@redhat.com> Fri Dec 12 08:54:40 CET 2008 Daniel Veillard <veillard@redhat.com>
* qemud/qemud.c: add --version support to libvirtd, patch by * qemud/qemud.c: add --version support to libvirtd, patch by

6
src/qemu_conf.c
View File

@ -673,13 +673,13 @@ static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev,
if (snprintf(buf, buflen, "telnet:%s:%s%s", if (snprintf(buf, buflen, "telnet:%s:%s%s",
dev->data.tcp.host, dev->data.tcp.host,
dev->data.tcp.service, dev->data.tcp.service,
dev->data.tcp.listen ? ",server" : "") >= buflen) dev->data.tcp.listen ? ",server,nowait" : "") >= buflen)
return -1; return -1;
} else { } else {
if (snprintf(buf, buflen, "tcp:%s:%s%s", if (snprintf(buf, buflen, "tcp:%s:%s%s",
dev->data.tcp.host, dev->data.tcp.host,
dev->data.tcp.service, dev->data.tcp.service,
dev->data.tcp.listen ? ",listen" : "") >= buflen) dev->data.tcp.listen ? ",server,nowait" : "") >= buflen)
return -1; return -1;
} }
break; break;
@ -687,7 +687,7 @@ static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev,
case VIR_DOMAIN_CHR_TYPE_UNIX: case VIR_DOMAIN_CHR_TYPE_UNIX:
if (snprintf(buf, buflen, "unix:%s%s", if (snprintf(buf, buflen, "unix:%s%s",
dev->data.nix.path, dev->data.nix.path,
dev->data.nix.listen ? ",listen" : "") >= buflen) dev->data.nix.listen ? ",server,nowait" : "") >= buflen)
return -1; return -1;
break; break;
} }

2
tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
View File

@ -1 +1 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel tcp:127.0.0.1:9999,listen -usb LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel tcp:127.0.0.1:9999,server,nowait -usb

2
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
View File

@ -1 +1 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial telnet:127.0.0.1:9999,server -parallel none -usb LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial telnet:127.0.0.1:9999,server,nowait -parallel none -usb