[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, experimental, updated. debian/0.5.1-2-7-g00e0e44

[Guido Guenther]

The following commit has been merged in the experimental branch:
commit 417a23c75169895fcb67006b55267dbc332ae83d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Dec 11 12:35:23 2008 +0100

    qemu: fix parallel/serial mode "tcp" and "unix"
    
    Closes: #507608

diff --git a/debian/patches/0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch b/debian/patches/0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch
new file mode 100644
index 0000000..bf73a44
--- /dev/null
+++ b/debian/patches/0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch
@@ -0,0 +1,63 @@
+From 42e1e104ca11ce85c8ca8094ac11a26ceb94f070 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 11 Dec 2008 12:02:50 +0100
+Subject: [PATCH] qemu: fix parallel/serial mode "tcp" and "unix"
+
+According to
+ http://bellard.org/qemu/qemu-doc.html
+the required option is 'server' not 'listen'. Use nowait so kvm/qemu doesn't
+timeout during monitor startup as it waits for an incoming connection.
+
+Closes: #507608
+---
+ src/qemu_conf.c                                    |    6 +++---
+ .../qemuxml2argv-parallel-tcp.args                 |    2 +-
+ .../qemuxml2argv-serial-tcp-telnet.args            |    2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index e6c378f..e890480 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -676,13 +676,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;
+@@ -690,7 +690,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 1a08bbb..e9bbc71 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 f2d1f17..ad37de4 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
+-- 
+1.6.0.3
+
diff --git a/debian/patches/series b/debian/patches/series
index c82d252..8a8fda7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
+0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch

-- 
Libvirt debian packaging