[qemu] Use upstream patch to fix build failure in msi/virtio-pci (thanks Hans de Goede).

[Richard W.M. Jones]

commit 0552ca5eb742b540c7d59a309dd4d23a1eb960c6
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Jul 5 16:03:54 2012 +0100

    Use upstream patch to fix build failure in msi/virtio-pci (thanks Hans de Goede).

 ...ve-msi-x-and-virtio-pci-from-Makefile.obj.patch |   53 --------------------
 ...use-of-kvm_irqchip_in_kernel-in-hwlib-cod.patch |   29 +++++++++++
 qemu.spec                                          |    9 ++--
 3 files changed, 33 insertions(+), 58 deletions(-)
---
diff --git a/0001-kvm-Enable-use-of-kvm_irqchip_in_kernel-in-hwlib-cod.patch b/0001-kvm-Enable-use-of-kvm_irqchip_in_kernel-in-hwlib-cod.patch
new file mode 100644
index 0000000..fa3f4d5
--- /dev/null
+++ b/0001-kvm-Enable-use-of-kvm_irqchip_in_kernel-in-hwlib-cod.patch
@@ -0,0 +1,29 @@
+From bbf3b80401d55ac3339160cefa17f0015317f512 Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <jan.kiszka at siemens.com>
+Date: Thu, 17 May 2012 10:32:37 -0300
+Subject: [PATCH] kvm: Enable use of kvm_irqchip_in_kernel in hwlib code
+
+Provide a dummy kvm_kernel_irqchip so that kvm_irqchip_in_kernel can be
+used by code that is not under CONFIG_KVM protection.
+
+Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
+Signed-off-by: Avi Kivity <avi at redhat.com>
+---
+ kvm-stub.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kvm-stub.c b/kvm-stub.c
+index b4cf03f..ec9a364 100644
+--- a/kvm-stub.c
++++ b/kvm-stub.c
+@@ -18,6 +18,7 @@
+ #include "kvm.h"
+ 
+ KVMState *kvm_state;
++bool kvm_kernel_irqchip;
+ 
+ int kvm_init_vcpu(CPUArchState *env)
+ {
+-- 
+1.7.10.4
+
diff --git a/qemu.spec b/qemu.spec
index e15759a..9989a53 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -38,7 +38,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -79,8 +79,8 @@ Source11: 99-qemu-guest-agent.rules
 Patch1:   0001-qemu-kvm-Add-missing-default-machine-options.patch
 Patch2:   0002-qemu-kvm-virtio-Do-not-register-mask-notifiers-witho.patch
 
-# Speculative patch to fix msi and virtio-pci modules in build (not upstream).
-Patch3:   0001-buildsys-Move-msi-x-and-virtio-pci-from-Makefile.obj.patch
+# Upstream patch to fix build of msi/virtio-pci.
+Patch3:   0001-kvm-Enable-use-of-kvm_irqchip_in_kernel-in-hwlib-cod.patch
 
 # Use siginfo_t instead of struct siginfo, for glibc in Rawhide.
 # Sent upstream 2012-07-05.
@@ -807,8 +807,7 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
-* Thu Jul  5 2012 Richard W.M. Jones <rjones at redhat.com> - 2:1.1.0-3
-- Add a hack for glibc from Rawhide, only affects linux-user.
+* Thu Jul  5 2012 Richard W.M. Jones <rjones at redhat.com> - 2:1.1.0-4
 - Disable tests since they hang intermittently.
 - Add kvmvapic.bin (replaces vapic.bin).
 - Add cpus-x86_64.conf.  qemu now creates /etc/qemu/target-x86_64.conf