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

diff --git a/ChangeLog b/ChangeLog
index 5b9a66900bacaaa4d679c06ff42fd2a82ac5d9f6..5653ee858f27da8a465513c6e52c45823962d974 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * qemud/qemud.c: add --version support to libvirtd, patch by

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 8c24cea8c7e85127433f6bcb097d3ead39f5c513..206fb0baefc1099dbe23c04d6659ec6e0d43cdb1 100644 (file)
--- 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 1a08bbbcbf96f255401c5b0b45f7d6564ec19003..e9bbc71dff96604e2a3b382af1bf6bf77a0eac80 100644 (file)
--- 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 f2d1f17b7849f9be1151312369e4435c62f288ac..ad37de474c5e3a687ef613f87c9e39081a4bc44f 100644 (file)
--- 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