From 531fd5eac71345d1004c4c00ab7e76b3bf94b512 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 16 Dec 2018 16:59:10 +0100
Subject: [PATCH] qemu: update to 3.1.0.

---
 ...irtio-assertion-failure-with-openbsd.patch | 55 -------------------
 srcpkgs/qemu/template                         | 12 ++--
 2 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/qemu/patches/0007-fix-virtio-assertion-failure-with-openbsd.patch

diff --git a/srcpkgs/qemu/patches/0007-fix-virtio-assertion-failure-with-openbsd.patch b/srcpkgs/qemu/patches/0007-fix-virtio-assertion-failure-with-openbsd.patch
deleted file mode 100644
index e58573a5212..00000000000
--- a/srcpkgs/qemu/patches/0007-fix-virtio-assertion-failure-with-openbsd.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From db812c4073c77c8a64db8d6663b3416a587c7b4a Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Thu, 23 Aug 2018 14:21:23 +0200
-Subject: [PATCH] virtio: update MemoryRegionCaches when guest negotiates
- features
-
-Because the cache is sized to include the rings and the event indices,
-negotiating the VIRTIO_RING_F_EVENT_IDX feature will result in the size
-of the cache changing.  And because MemoryRegionCache accesses are
-range-checked, if we skip this we end up with an assertion failure.
-This happens with OpenBSD 6.3.
-
-Reported-by: Fam Zheng <famz@redhat.com>
-Fixes: 97cd965c070152bc626c7507df9fb356bbe1cd81
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Tested-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
----
- hw/virtio/virtio.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
-index d4e4d98b595..f6a588ab57e 100644
---- hw/virtio/virtio.c
-+++ hw/virtio/virtio.c
-@@ -2006,14 +2006,25 @@ static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val)
- 
- int virtio_set_features(VirtIODevice *vdev, uint64_t val)
- {
--   /*
-+    int ret;
-+    /*
-      * The driver must not attempt to set features after feature negotiation
-      * has finished.
-      */
-     if (vdev->status & VIRTIO_CONFIG_S_FEATURES_OK) {
-         return -EINVAL;
-     }
--    return virtio_set_features_nocheck(vdev, val);
-+    ret = virtio_set_features_nocheck(vdev, val);
-+    if (!ret && virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
-+        /* VIRTIO_RING_F_EVENT_IDX changes the size of the caches.  */
-+        int i;
-+        for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
-+            if (vdev->vq[i].vring.num != 0) {
-+                virtio_init_region_cache(vdev, i);
-+            }
-+        }
-+    }
-+    return ret;
- }
- 
- int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 08299d26a85..e890d2fd120 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,13 +1,13 @@
 # Template file for 'qemu'
 pkgname=qemu
-version=3.0.0
-revision=3
+version=3.1.0
+revision=1
 short_desc="Open Source Processor Emulator"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://qemu.org"
-distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=933e62ad604f5f8d0a93f5e0a98fd95f9d2e23ff1dbd0c744c6c7506bba8ebe8
+homepage="https://www.qemu.org"
+distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
+checksum=98fee0c86b299ebaf08587ba8df1dc8bb7152708d62937a0631875d95cc8d921
 nocross=https://api.travis-ci.org/jobs/210268003/log.txt
 
 nostrip=yes
@@ -69,7 +69,7 @@ do_configure() {
 		$(vopt_if sdl "--with-sdlabi=1.2") \
 		$(vopt_if sdl2 "--with-sdlabi=2.0") \
 		$(vopt_enable smartcard) \
-		$(vopt_if gtk3 "--enable-gtk --with-gtkabi=3.0") ${args}
+		$(vopt_if gtk3 "--enable-gtk") ${args}
 }
 do_build() {
 	# Remove our strip(1) wrapper... E2BIG.