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

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 208c924c2f4510d68e57dbdd157fe99a468f89f2
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Feb 5 17:08:51 2009 +0100

    add minimal workaround for qemu starup race

diff --git a/debian/patches/0005-minimal-workaround-for-qemu-startup-race.patch b/debian/patches/0005-minimal-workaround-for-qemu-startup-race.patch
new file mode 100644
index 0000000..9f7645d
--- /dev/null
+++ b/debian/patches/0005-minimal-workaround-for-qemu-startup-race.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 31 Jan 2009 14:54:36 +0100
+Subject: [PATCH] minimal workaround for qemu startup race
+
+---
+ src/qemu_driver.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 09f69bf..b2f2b47 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -674,8 +674,6 @@ qemudReadMonitorOutput(virConnectPtr conn,
+                                  _("Failure while reading %s startup output"), what);
+                 return -1;
+             }
+-        } else if (ret == 0) {
+-            return 0;
+         } else {
+             got += ret;
+             buf[got] = '\0';
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4acfbb9..883f889 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-Don-t-hardcode-ssh-port.patch
+0005-minimal-workaround-for-qemu-startup-race.patch

-- 
Libvirt debian packaging