From 007776f3e41111f448bd5937aecf0a92e3f150b3 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 15 Nov 2018 19:50:28 -0500
Subject: [PATCH] Rebase to qemu-3.1.0-rc1

---
 .gitignore |  1 +
 qemu.spec  | 22 +++++++++++++++-------
 sources    |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e46378c..a334f10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /qemu-2.12.0.tar.xz
 /qemu-3.0.0-rc3.tar.xz
 /qemu-3.0.0.tar.xz
+/qemu-3.1.0-rc1.tar.xz
diff --git a/qemu.spec b/qemu.spec
index 57b6a87..eb15f91 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -95,7 +95,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
 
 
 # Release candidate version tracking
-#global rcver rc3
+%global rcver rc1
 %if 0%{?rcver:1}
 %global rcrel .%{rcver}
 %global rcstr -%{rcver}
@@ -104,8 +104,8 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 3.0.0
-Release: 1%{?rcrel}%{?dist}
+Version: 3.1.0
+Release: 0.1%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -246,6 +246,10 @@ BuildRequires: capstone-devel
 BuildRequires: libxml2-devel
 # python scripts in the build process
 BuildRequires: python3
+# qemu 3.1: Used for nvdimm
+BuildRequires: libpmem-devel
+# qemu 3.1: Used for qemu-ga
+BuildRequires: libudev-devel
 
 BuildRequires: glibc-static pcre-static glib2-static zlib-static
 
@@ -882,7 +886,6 @@ run_configure \
     --enable-mpath \
     %{spiceflag} \
     --with-sdlabi="2.0" \
-    --with-gtkabi="3.0"
 
 echo "config-host.mak contents:"
 echo "==="
@@ -917,7 +920,9 @@ run_configure \
     --disable-brlapi \
     --disable-mpath \
     --disable-libnfs \
-    --disable-capstone
+    --disable-capstone \
+    --disable-xen \
+    --disable-rdma
 
 make V=1 %{?_smp_mflags} $buildldflags
 
@@ -1197,9 +1202,11 @@ getent passwd qemu >/dev/null || \
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*
 %{_mandir}/man7/qemu-block-drivers.7*
+%{_mandir}/man7/qemu-cpu-models.7*
 %{_mandir}/man7/qemu-ga-ref.7*
 %{_mandir}/man7/qemu-qmp-ref.7*
 %{_bindir}/virtfs-proxy-helper
+%{_bindir}/qemu-edid
 %{_bindir}/qemu-keymap
 %{_bindir}/qemu-pr-helper
 %{_unitdir}/qemu-pr-helper.service
@@ -1497,11 +1504,9 @@ getent passwd qemu >/dev/null || \
 %files system-ppc-core
 %{_bindir}/qemu-system-ppc
 %{_bindir}/qemu-system-ppc64
-%{_bindir}/qemu-system-ppcemb
 %{_datadir}/systemtap/tapset/qemu-system-ppc*.stp
 %{_mandir}/man1/qemu-system-ppc.1*
 %{_mandir}/man1/qemu-system-ppc64.1*
-%{_mandir}/man1/qemu-system-ppcemb.1*
 %{_datadir}/%{name}/bamboo.dtb
 %{_datadir}/%{name}/canyonlands.dtb
 %{_datadir}/%{name}/ppc_rom.bin
@@ -1598,6 +1603,9 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Thu Nov 15 2018 Cole Robinson <crobinso@redhat.com> - 2:3.1.0-0.1.rc1
+- Rebase to qemu-3.1.0-rc1
+
 * Wed Aug 15 2018 Cole Robinson <crobinso@redhat.com> - 2:3.0.0-1
 - Rebase to qemu-3.0.0 GA
 
diff --git a/sources b/sources
index c7b3cb2..77f4f37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qemu-3.0.0.tar.xz) = a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000bd28357697b08f3b656899dceb9e459350b8d55557817444ed5d7fa380a5a
+SHA512 (qemu-3.1.0-rc1.tar.xz) = 20f4e8516419c308025bb349a2abb9b8ce43d9ce5220c2c1d949c26c4de91fbbe0cc713f632e1baec4cc99307bbbeb8aa4296b52321e3d39faa3731d904bf897