From 31c6335e4b8050217f9eae22b4ae97966b253b24 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Oct 19 2012 09:47:08 +0000
Subject: add s390x KVM support


---

diff --git a/kvm.modules b/kvm.modules
index acf50b2..363c123 100755
--- a/kvm.modules
+++ b/kvm.modules
@@ -6,20 +6,20 @@ case $(uname -m) in
         grep svm /proc/cpuinfo >/dev/null 2>&1 && svm=1
 
         if [ "$vmx" ] || [ "$svm" ]; then
-            [ "$vmx" ] && modprobe -b kvm-intel >/dev/null 2>&1
-            [ "$svm" ] && modprobe -b kvm-amd >/dev/null 2>&1
-
-            kvm=1
+            [ "$vmx" ] && modprobe -b kvm-intel >/dev/null 2>&1 && kvm=1
+            [ "$svm" ] && modprobe -b kvm-amd >/dev/null 2>&1 && kvm=1
         fi
         ;;
     ppc64)
         grep OPAL  /proc/cpuinfo >/dev/null 2>&1 && opal=1
 
         if [ "$opal" ]; then
-            modprobe -b kvm >/dev/null 2>&1
-            kvm=1
+            modprobe -b kvm >/dev/null 2>&1 && kvm=1
         fi
         ;;
+    s390x)
+        modprobe -b kvm >/dev/null 2>&1 && kvm=1
+        ;;
 esac
 
 if [ "$kvm" ]; then
diff --git a/qemu.spec b/qemu.spec
index 961a048..4b4cff0 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -36,8 +36,7 @@
 %if %{with exclusive_x86_64}
 %global kvm_archs x86_64
 %else
-# TODO: s390
-%global kvm_archs %{ix86} x86_64 ppc64
+%global kvm_archs %{ix86} x86_64 ppc64 s390x
 %endif
 
 %ifarch %{ix86} x86_64
@@ -72,6 +71,11 @@
 %global kvm_package   system-ppc
 %global kvm_target    ppc64
 %endif
+%ifarch s390x
+%global system_s390x  kvm
+%global kvm_package   system-s390x
+%global kvm_target    s390x
+%endif
 
 %if %{with kvmonly}
 # If kvmonly, put the qemu-kvm binary in the qemu-kvm package
@@ -974,7 +978,11 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/openbios-sparc64
 # Provided by package SLOF
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/slof.bin
 
-# remove possibly unpackaged files:
+# Remove possibly unpackaged files.  Unlike others that are removed
+# unconditionally, these firmware files are still distributed as a binary
+# together with the qemu package.  We should try to move at least s390-zipl.rom
+# to a separate package...  Discussed here on the packaging list:
+# https://lists.fedoraproject.org/pipermail/packaging/2012-July/008563.html
 %if 0%{!?system_alpha:1}
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/palcode-clipper
 %endif
@@ -1340,6 +1348,10 @@ fi
 %{_bindir}/qemu-system-s390x
 %{_datadir}/systemtap/tapset/qemu-system-s390x.stp
 %{_datadir}/%{name}/s390-zipl.rom
+%ifarch s390x
+%{?kvm_files:}
+%{?qemu_kvm_files:}
+%endif
 %endif
 
 %if 0%{?system_sh4:1}
@@ -1405,6 +1417,7 @@ fi
 
 %changelog
 * Fri Oct 19 2012 Paolo Bonzini <pbonzini@redhat.com> - 2:1.2.0-16
+- add s390x KVM support
 - distribute pre-built firmware or device trees for Alpha, Microblaze, S390
 - add missing system targets
 - add missing linux-user targets