[libguestfs] Add upstream patch to fix virtio-serial test for qemu 0.15.

[Richard W.M. Jones]

commit 47d9115870d3fbf2e7c41a0205abf7cba8ba78a5
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jul 19 19:51:05 2011 +0100

    Add upstream patch to fix virtio-serial test for qemu 0.15.

 libguestfs-1.11.20-qemu-virtio-serial-test.patch |   44 ++++++++++++++++++++++
 libguestfs.spec                                  |    9 ++++-
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/libguestfs-1.11.20-qemu-virtio-serial-test.patch b/libguestfs-1.11.20-qemu-virtio-serial-test.patch
new file mode 100644
index 0000000..29bd642
--- /dev/null
+++ b/libguestfs-1.11.20-qemu-virtio-serial-test.patch
@@ -0,0 +1,44 @@
+--- configure.orig	2011-07-19 19:43:38.952436219 +0100
++++ configure	2011-07-19 19:48:04.504543100 +0100
+@@ -36827,9 +36827,40 @@
+ 
+ 
+ if test "x$vmchannel_test" != "xno"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking that $QEMU -help works" >&5
++$as_echo_n "checking that $QEMU -help works... " >&6; }
++    if $QEMU -help > /dev/null 2>&1; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++    else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "$QEMU -help: command failed.
++
++This could be a very old version of qemu, or qemu might not be
++working.
++
++See \`config.log' for more details" "$LINENO" 5; }
++    fi
++
++    # qemu since 0.15 requires the -machine accel=tcg option, otherwise
++    # it won't start up.  QEMU DEVELOPERS, PLEASE ADD CAPABILITIES TESTING.
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if this qemu has the -machine accel=tcg option" >&5
++$as_echo_n "checking if this qemu has the -machine accel=tcg option... " >&6; }
++    if $QEMU -help 2>&1 | grep -sq -- '-machine.*accel.*tcg'; then
++        qemu_machine_accel_tcg="-machine accel=tcg"
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qemu_machine_accel_tcg" >&5
++$as_echo "$qemu_machine_accel_tcg" >&6; }
++    else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    fi
++
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for virtio-serial support in $QEMU" >&5
+ $as_echo_n "checking for virtio-serial support in $QEMU... " >&6; }
+-    if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
++    if $QEMU $qemu_machine_accel_tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+     else
diff --git a/libguestfs.spec b/libguestfs.spec
index 1005471..ca6e827 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.11.20
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -44,6 +44,9 @@ Patch0:        libguestfs-1.7.13-no-fuse-test.patch
 # See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
 Patch1:        0001-perl-Don-t-set-CCFLAGS.patch
 
+# Upstream patch to fix virtio-serial test for qemu 0.15.
+Patch2:        libguestfs-1.11.20-qemu-virtio-serial-test.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -496,6 +499,7 @@ for %{name}.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 mkdir -p daemon/m4
 
@@ -856,6 +860,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 19 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.11.20-2
+- Add upstream patch to fix virtio-serial test for qemu 0.15.
+
 * Tue Jul 19 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.11.20-1
 - New upstream version 1.11.20.
 - Replace standard README file with one suited for Fedora.