diff --git a/ChangeLog b/ChangeLog index 5b9a66900b..5653ee858f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Fri Dec 12 10:28:41 CET 2008 Guido Günther + + 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 * qemud/qemud.c: add --version support to libvirtd, patch by diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 8c24cea8c7..206fb0baef 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -673,13 +673,13 @@ static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, if (snprintf(buf, buflen, "telnet:%s:%s%s", dev->data.tcp.host, dev->data.tcp.service, - dev->data.tcp.listen ? ",server" : "") >= buflen) + dev->data.tcp.listen ? ",server,nowait" : "") >= buflen) return -1; } else { if (snprintf(buf, buflen, "tcp:%s:%s%s", dev->data.tcp.host, dev->data.tcp.service, - dev->data.tcp.listen ? ",listen" : "") >= buflen) + dev->data.tcp.listen ? ",server,nowait" : "") >= buflen) return -1; } break; @@ -687,7 +687,7 @@ static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, case VIR_DOMAIN_CHR_TYPE_UNIX: if (snprintf(buf, buflen, "unix:%s%s", dev->data.nix.path, - dev->data.nix.listen ? ",listen" : "") >= buflen) + dev->data.nix.listen ? ",server,nowait" : "") >= buflen) return -1; break; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args index 1a08bbbcbf..e9bbc71dff 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args @@ -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 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args index f2d1f17b78..ad37de474c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args @@ -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