From bd8b34f6e43d97121351ff74dc8127e5f40372d8 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Apr 14 2016 23:48:35 +0000
Subject: Merge branch 'master' into f24


---

diff --git a/50-kvm-s390x.conf b/50-kvm-s390x.conf
new file mode 100644
index 0000000..0df7f0d
--- /dev/null
+++ b/50-kvm-s390x.conf
@@ -0,0 +1,3 @@
+# KVM S390 VM creation fails without this set
+# https://www.mail-archive.com/kvm@vger.kernel.org/msg115576.html
+vm.allocate_pgste = 1
diff --git a/qemu.spec b/qemu.spec
index c32b5ec..9333d9f 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -39,7 +39,7 @@
 %endif
 
 # Release candidate version tracking
-%global rcver rc1
+%global rcver rc2
 %if 0%{?rcver:1}
 %global rcstr -%{rcver}
 %endif
@@ -60,7 +60,6 @@ Source1: qemu.binfmt
 
 # Creates /dev/kvm
 Source3: 80-kvm.rules
-
 # KSM control scripts
 Source4: ksm.service
 Source5: ksm.sysconfig
@@ -68,16 +67,19 @@ Source6: ksmctl.c
 Source7: ksmtuned.service
 Source8: ksmtuned
 Source9: ksmtuned.conf
-
+# guest agent service
 Source10: qemu-guest-agent.service
+# guest agent udev rules
 Source11: 99-qemu-guest-agent.rules
+# /etc/qemu/bridge.conf
 Source12: bridge.conf
-
-# qemu-kvm back compat wrapper
+# qemu-kvm back compat wrapper installed as /usr/bin/qemu-kvm
 Source13: qemu-kvm.sh
-
-# For modprobe.d
+# /etc/modprobe.d/kvm.conf
 Source20: kvm.conf
+# /etc/sysctl.d/50-kvm-s390x.conf
+Source21: 50-kvm-s390x.conf
+
 
 BuildRequires: SDL2-devel
 BuildRequires: zlib-devel
@@ -175,6 +177,8 @@ BuildRequires: libtasn1-devel
 BuildRequires: libcacard-devel >= 2.5.0
 # virgl 3d support
 BuildRequires: virglrenderer-devel
+# Needed explicitly for qemu 2.6 GL support
+BuildRequires: mesa-libgbm-devel
 
 
 Requires: %{name}-user = %{epoch}:%{version}-%{release}
@@ -652,6 +656,12 @@ install -D -p -m 0644 %{_sourcedir}/kvm.conf %{buildroot}%{_sysconfdir}/modprobe
 install -m 0644 %{_sourcedir}/qemu-guest-agent.service %{buildroot}%{_unitdir}
 install -m 0644 %{_sourcedir}/99-qemu-guest-agent.rules %{buildroot}%{_udevdir}
 
+%ifarch s390x
+install -d %{buildroot}%{_sysconfdir}/sysctl.d
+install -m 0644 %{_sourcedir}/50-kvm-s390.conf %{buildroot}%{_sysconfdir}/sysctl.d
+%endif
+
+
 # Install kvm specific bits
 %if %{have_kvm}
 mkdir -p %{buildroot}%{_bindir}/
@@ -834,6 +844,10 @@ if test -f "$hostqemu"; then qemu-sanity-check --qemu=$hostqemu ||: ; fi
 # a neverending source of trouble, so we just force it with chmod. For
 # more info see: https://bugzilla.redhat.com/show_bug.cgi?id=950436
 chmod --quiet 666 /dev/kvm || :
+
+%ifarch s390x
+%sysctl_apply 50-kvm-s390x.conf
+%endif
 %endif
 
 
@@ -1099,6 +1113,7 @@ getent passwd qemu >/dev/null || \
 %{_datadir}/%{name}/s390-ccw.img
 %ifarch s390x
 %{?kvm_files:}
+%{_sysconfdir}/sysctl.d/50-kvm-s390x.conf
 %endif
 
 
@@ -1173,6 +1188,12 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Thu Apr 14 2016 Cole Robinson <crobinso@redhat.com> 2:2.6.0-0.1.rc2
+- Rebased to version 2.6.0-rc2
+- Fix GL deps (bz 1325966)
+- Ship sysctl file to fix s390x kvm (bz 1290589)
+- Fix FTBFS on s390 (bz 1326247)
+
 * Thu Apr 07 2016 Cole Robinson <crobinso@redhat.com> - 2:2.6.0-0.1.rc1
 - Rebased to version 2.6.0-rc1
 
diff --git a/sources b/sources
index db3824d..a53b4e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c1d9f7a8f712d281ebebf4572ee4f238  qemu-2.6.0-rc1.tar.bz2
+0c07d181f4fafcc651570b922881db88  qemu-2.6.0-rc2.tar.bz2