[libvirt] Fix for 32 bit qemu renamed to qemu-system-i386 (RHBZ#857026).

[Richard W.M. Jones]

commit 52f3bedee7d1c28491b9ad40e6733012e40ba199
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 13 14:43:04 2012 +0100

    Fix for 32 bit qemu renamed to qemu-system-i386 (RHBZ#857026).
    
    The difference in the output of virsh capabilities (non-root)
    before and after is:
    
     <capabilities>
    
       <host>
    -    <uuid>9ecd5b8f-4b44-5dae-f4c6-4b9cf108e47a</uuid>
    +    <uuid>4cae6f0f-dd64-8d9a-bc36-b3f2e62844cf</uuid>
         <cpu>
           <arch>i686</arch>
           <model>Westmere</model>
    @@ -34,7 +34,7 @@
         <os_type>hvm</os_type>
         <arch name='i686'>
           <wordsize>32</wordsize>
    -      <emulator>/bin/qemu-system-x86_64</emulator>
    +      <emulator>/bin/qemu-system-i386</emulator>
           <machine>pc-1.2</machine>
           <machine>none</machine>
           <machine canonical='pc-1.2'>pc</machine>

 ...emu-system-i386-as-binary-instead-of-qemu.patch |   27 ++++++++++++++++++++
 libvirt.spec                                       |    8 +++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch b/0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch
new file mode 100644
index 0000000..585c39e
--- /dev/null
+++ b/0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch
@@ -0,0 +1,27 @@
+From 37865f1dead1fac2ee34af48f96d19d686296e04 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Thu, 13 Sep 2012 14:37:22 +0100
+Subject: [PATCH] Use 'qemu-system-i386' as binary instead of 'qemu'.
+
+---
+ src/qemu/qemu_capabilities.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index af3b0b2..179b3d2 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -244,8 +244,8 @@ static const struct qemu_feature_flags const arch_info_x86_64_flags [] = {
+ 
+ /* The archicture tables for supported QEMU archs */
+ static const struct qemu_arch_info const arch_info_hvm[] = {
+-    {  "i686",   32, NULL, "qemu",
+-       "qemu-system-x86_64", arch_info_i686_flags, 4 },
++    {  "i686",   32, NULL, "qemu-system-i386",
++       NULL, arch_info_i686_flags, 4 },
+     {  "x86_64", 64, NULL, "qemu-system-x86_64",
+        NULL, arch_info_x86_64_flags, 2 },
+     {  "arm",    32, NULL, "qemu-system-arm",    NULL, NULL, 0 },
+-- 
+1.7.11.4
+
diff --git a/libvirt.spec b/libvirt.spec
index 92fa522..3930320 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -315,7 +315,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 0.10.1
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -329,6 +329,8 @@ Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
 Patch1: %{name}-dnsmasq-drop-filterwin2k.patch
 # Fix unwanted connection closing, needed for boxes
 Patch2: %{name}-fix-unwanted-connection-closing.patch
+# Fix qemu -> qemu-system-i386 (RHBZ#857026).
+Patch3: 0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch
 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
@@ -1041,6 +1043,7 @@ of recent versions of Linux (and other OSes).
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %if ! %{with_xen}
@@ -1868,6 +1871,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
 %endif
 
 %changelog
+* Thu Sep 13 2012 Richard W.M. Jones <rjones at redhat.com> - 0.10.1-4
+- Fix for 32 bit qemu renamed to qemu-system-i386 (RHBZ#857026).
+
 * Wed Sep 12 2012 Cole Robinson <crobinso at redhat.com> - 0.10.1-3
 - Fix libvirtd segfault with old netcf-libs (bz 853381)
 - Drop unneeded dnsmasq --filterwin2k