Accepting request 531017 from home:bfrogers:branches:Virtualization

Update to v2.10.1 a stable, bug-fix-only release
Also needed one more fix for qemu-testsuite

OBS-URL: https://build.opensuse.org/request/show/531017
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=367

0001-XXX-dont-dump-core-on-sigabort.patch

@@ -1,4 +1,4 @@
-From 5e63842369b27b4db6bc20d1d2652f7ce0ed0c29 Mon Sep 17 00:00:00 2001
+From 7581f4407184223ed510ad37c7e50d0c958387e9 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 21 Nov 2011 23:50:36 +0100
 Subject: [PATCH] XXX dont dump core on sigabort

0002-qemu-binfmt-conf-Modify-default-pat.patch

@@ -1,4 +1,4 @@
-From a4246a201cfc32b55f59afafb42ba81758f2dd66 Mon Sep 17 00:00:00 2001
+From c66371e3153c4a27382c04105fb411a47260d218 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 10 Aug 2016 19:00:24 +0200
 Subject: [PATCH] qemu-binfmt-conf: Modify default path

0003-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From b05b060316ffa77e26dc32215b3cfd49286b0c2f Mon Sep 17 00:00:00 2001
+From cfda7e6b1ea8a2851487abe2c8c0d667afe8f9e6 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:25:41 +0200
 Subject: [PATCH] qemu-cvs-gettimeofday

0004-qemu-cvs-ioctl_debug.patch

@@ -1,4 +1,4 @@
-From b92757bdfdd6bec948283cec7183ab3a2cdfa2d9 Mon Sep 17 00:00:00 2001
+From 7e6b306a14558468fd01def2ee997b2b6dc84210 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:26:33 +0200
 Subject: [PATCH] qemu-cvs-ioctl_debug

0005-qemu-cvs-ioctl_nodirection.patch

@@ -1,4 +1,4 @@
-From 1e894eafd90d078886d31e50774d8f3b5732f087 Mon Sep 17 00:00:00 2001
+From c4ee285e4bb85caa69a1870f313a22c1214bb5c6 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:27:36 +0200
 Subject: [PATCH] qemu-cvs-ioctl_nodirection

0006-linux-user-add-binfmt-wrapper-for-a.patch

@@ -1,4 +1,4 @@
-From 05252b67f56cf792580ff32cd8f577f747bf588e Mon Sep 17 00:00:00 2001
+From 17836cc820d22cb40b6a8fbf11606d47ba856236 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 30 Sep 2011 19:40:36 +0200
 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling

0007-PPC-KVM-Disable-mmu-notifier-check.patch

@@ -1,4 +1,4 @@
-From e1e2752d5d87ad1b341e1205938c627ca0d7f82c Mon Sep 17 00:00:00 2001
+From d9c823f0543f04bcef646f910cd8879a851e75c5 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 6 Jan 2012 01:05:55 +0100
 Subject: [PATCH] PPC: KVM: Disable mmu notifier check

0008-linux-user-fix-segfault-deadlock.patch

@@ -1,4 +1,4 @@
-From d37e6a8cf4aafca05c62d45a9e0f6c7a2315bd90 Mon Sep 17 00:00:00 2001
+From 8afb2be95138a0e8cbee39bdda6394dffe8c330f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 13 Jan 2012 17:05:41 +0100
 Subject: [PATCH] linux-user: fix segfault deadlock

0009-linux-user-binfmt-support-host-bina.patch

@@ -1,4 +1,4 @@
-From 36b9976bddad38fa0aa991655482c0c087c2e704 Mon Sep 17 00:00:00 2001
+From 8bcafa995d4d2b4a29135a6cdfffc58d13480ddb Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 18:02:33 +0100
 Subject: [PATCH] linux-user: binfmt: support host binaries

0010-linux-user-Fake-proc-cpuinfo.patch

@@ -1,4 +1,4 @@
-From 8993e5938b5c14148c8fe4898946731c61707ecd Mon Sep 17 00:00:00 2001
+From 66ea32c79be3274c9325d0063604fc881e4d1dfb Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 23 Jul 2012 10:24:14 +0200
 Subject: [PATCH] linux-user: Fake /proc/cpuinfo

0011-linux-user-XXX-disable-fiemap.patch

@@ -1,4 +1,4 @@
-From 6c7351296bd1d8b500f33c7ef7832d3d12a76bb4 Mon Sep 17 00:00:00 2001
+From d8c7d4aacc3c49a46c24fce329e11157334a9991 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 21 Aug 2012 14:20:40 +0200
 Subject: [PATCH] linux-user: XXX disable fiemap

0012-linux-user-use-target_ulong.patch

@@ -1,4 +1,4 @@
-From ca891b6c05280246f827a2692d216efa763a3eff Mon Sep 17 00:00:00 2001
+From 6b87f98a760341933d6541857f2d2d46bb3037cc Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 9 Oct 2012 09:06:49 +0200
 Subject: [PATCH] linux-user: use target_ulong

0013-console-add-question-mark-escape-op.patch

@@ -1,4 +1,4 @@
-From 8f591fd391262fbf76373136fc5a1629635b4de4 Mon Sep 17 00:00:00 2001
+From a4eba69bc99000fdfcfc33d5d18a46b3d03927de Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 6 Jun 2011 06:53:52 +0200
 Subject: [PATCH] console: add question-mark escape operator
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ui/console.c b/ui/console.c
-index d2d3534c49..c28e19c375 100644
+index f0292d7820..6950aea8a5 100644
 --- a/ui/console.c
 +++ b/ui/console.c
 @@ -880,7 +880,7 @@ static void console_putchar(QemuConsole *s, int ch)

0014-Make-char-muxer-more-robust-wrt-sma.patch

@@ -1,4 +1,4 @@
-From 6d94b304169f112118fb6dd78c5cd2617e4613f6 Mon Sep 17 00:00:00 2001
+From 796187f66978f7e0b41fb5e50a009c0003b4b3eb Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Apr 2010 17:36:23 +0200
 Subject: [PATCH] Make char muxer more robust wrt small FIFOs

0015-linux-user-lseek-explicitly-cast-no.patch

@@ -1,4 +1,4 @@
-From 94bf05dfa58cb57d03bb02e9937c029df3497022 Mon Sep 17 00:00:00 2001
+From b9f37480429f32cd09c3d26eca0f52efdad69b5c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 13 Dec 2012 14:29:22 +0100
 Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed

0016-AIO-Reduce-number-of-threads-for-32.patch

@@ -1,4 +1,4 @@
-From 2ca6f0f0129374584098e60809afaaa43c609666 Mon Sep 17 00:00:00 2001
+From 1691c270be2ee73c499cf8df8729c58173b8df18 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 14 Jan 2015 01:32:11 +0100
 Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts

0017-xen_disk-Add-suse-specific-flush-di.patch

@@ -1,4 +1,4 @@
-From c6660c98496ab59522e3ebaa1f1339beff864ca5 Mon Sep 17 00:00:00 2001
+From 6fb43092cfca3e96c07ad78727a6b78a1d3b981f Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Wed, 9 Mar 2016 15:18:11 -0700
 Subject: [PATCH] xen_disk: Add suse specific flush disable handling and map to

0018-qemu-bridge-helper-reduce-security-.patch

@@ -1,4 +1,4 @@
-From 87f1e67999ab7ddbbb9b2a4a04e82ceb7cdcbdf1 Mon Sep 17 00:00:00 2001
+From 9d3f31c6f079728dac949d04623df82ffffeacd2 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Tue, 2 Aug 2016 11:36:02 -0600
 Subject: [PATCH] qemu-bridge-helper: reduce security profile

0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch

@@ -1,4 +1,4 @@
-From 9fd37e866278fac910e0321aeea4c950f26cb224 Mon Sep 17 00:00:00 2001
+From 3db96f1f734c24de67ca43bedf4853b2634fcd8a Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@suse.de>
 Date: Fri, 12 Aug 2016 18:20:49 +0200
 Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt

0020-configure-Fix-detection-of-seccomp-.patch

@@ -1,4 +1,4 @@
-From 07887c4bbde2e00ded180e90395c61dfe10fbbf1 Mon Sep 17 00:00:00 2001
+From a2cbc794e201460c128e455ae0dba9f78ac6476e Mon Sep 17 00:00:00 2001
 From: markkp <mpost@suse.com>
 Date: Thu, 11 Aug 2016 16:28:39 -0400
 Subject: [PATCH] configure: Fix detection of seccomp on s390x

0021-linux-user-properly-test-for-infini.patch

@@ -1,4 +1,4 @@
-From 846384277e21e0b4d7bf815a3a26c5fc7d34e288 Mon Sep 17 00:00:00 2001
+From e176ceb6119cacf3d62d04efc8382a05e5d8db48 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@linux-m68k.org>
 Date: Thu, 8 Sep 2016 11:21:05 +0200
 Subject: [PATCH] linux-user: properly test for infinite timeout in poll (#8)

0022-roms-Makefile-pass-a-packaging-time.patch

@@ -1,4 +1,4 @@
-From f8462e79c79efa3de96835939d08aed29a5c5213 Mon Sep 17 00:00:00 2001
+From d896525c8fde7a57af1516b0ca3c54fd9b562c32 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Sat, 19 Nov 2016 08:06:30 -0700
 Subject: [PATCH] roms/Makefile: pass a packaging timestamp to subpackages with

0023-Raise-soft-address-space-limit-to-h.patch

@@ -1,4 +1,4 @@
-From b839546b8729e0ed6415ddc16799ba6cca8e9e09 Mon Sep 17 00:00:00 2001
+From c66c18e3f6c228ec3204aa76afc567e3834c3a13 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 15 Jan 2012 19:53:49 +0100
 Subject: [PATCH] Raise soft address space limit to hard limit
@@ -17,7 +17,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/vl.c b/vl.c
-index 8e247cc2a2..9bfbc25c6b 100644
+index d63269332f..b939df9622 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -26,6 +26,7 @@

0024-increase-x86_64-physical-bits-to-42.patch

@@ -1,4 +1,4 @@
-From 5c70d36188f9864e847475cc0369ce87e8b8f779 Mon Sep 17 00:00:00 2001
+From df2a986f0271437a0ea2242014e90e0dfdae12cc Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Fri, 17 May 2013 16:49:58 -0600
 Subject: [PATCH] increase x86_64 physical bits to 42

0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch

@@ -1,4 +1,4 @@
-From 5b7e140d6d806dda842e9731337fb179dfab3bfa Mon Sep 17 00:00:00 2001
+From d6d884c2201c9215b061e80fcab0cd71df3c4851 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 12 Jun 2013 19:26:37 +0200
 Subject: [PATCH] vga: Raise VRAM to 16 MiB for pc-0.15 and below

0026-i8254-Fix-migration-from-SLE11-SP2.patch

@@ -1,4 +1,4 @@
-From f56bc071c0ad6ba30b6f2c6c224916c0c2fc5fd8 Mon Sep 17 00:00:00 2001
+From 4f418097d0297836e6e7576e83f69c851716f899 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 31 Jul 2013 17:05:29 +0200
 Subject: [PATCH] i8254: Fix migration from SLE11 SP2

0027-acpi_piix4-Fix-migration-from-SLE11.patch

@@ -1,4 +1,4 @@
-From 926544e46fbfebc5a09d1eac59c3b748a9242acd Mon Sep 17 00:00:00 2001
+From b54cf4a53119c84576eb016cd5dbcaef14504747 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 31 Jul 2013 17:32:35 +0200
 Subject: [PATCH] acpi_piix4: Fix migration from SLE11 SP2
@@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
-index f276967365..85557a7fab 100644
+index f4fd5907b8..261b746b26 100644
 --- a/hw/acpi/piix4.c
 +++ b/hw/acpi/piix4.c
 @@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = {

0028-Fix-tigervnc-long-press-issue.patch

@@ -1,4 +1,4 @@
-From 1a77800ad89b4d90155b82181557690a91d9349f Mon Sep 17 00:00:00 2001
+From d609e5c88bf83530538ac63c74789f9d47cfb4b3 Mon Sep 17 00:00:00 2001
 From: Chunyan Liu <cyliu@suse.com>
 Date: Thu, 3 Mar 2016 16:48:17 +0800
 Subject: [PATCH] Fix tigervnc long press issue

0029-string-input-visitor-Fix-uint64-par.patch

@@ -1,4 +1,4 @@
-From 3e0bafa61adbdeb3d2fd0800ed6d89fcf3a478f9 Mon Sep 17 00:00:00 2001
+From 5812dbdce09f97f52d832c67f509753aa8a93f59 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:21:11 +0200
 Subject: [PATCH] string-input-visitor: Fix uint64 parsing

0030-test-string-input-visitor-Add-int-t.patch

@@ -1,4 +1,4 @@
-From a7e094ddefb5e7eea6376840e501b928b6c4c668 Mon Sep 17 00:00:00 2001
+From c3e8ce72202ea22d0c4c649ca57b8392515e8cac Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:23:50 +0200
 Subject: [PATCH] test-string-input-visitor: Add int test case

0031-test-string-input-visitor-Add-uint6.patch

@@ -1,4 +1,4 @@
-From c90474a98dc87e92c66c382110fd3942b4fc399d Mon Sep 17 00:00:00 2001
+From 5483b85712ce2d049b26ce8bf78b790dc9c2c34d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 24 Sep 2015 19:24:23 +0200
 Subject: [PATCH] test-string-input-visitor: Add uint64 test

0032-tests-Add-QOM-property-unit-tests.patch

@@ -1,4 +1,4 @@
-From 9aed1b7bf6e3d84c2f046b44d89d1237b905c5b9 Mon Sep 17 00:00:00 2001
+From bc88c2eb27f326884bc328708313eb750250fb9c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 6 Sep 2015 20:12:42 +0200
 Subject: [PATCH] tests: Add QOM property unit tests

0033-tests-Add-scsi-disk-test.patch

@@ -1,4 +1,4 @@
-From 915562c2846fac9a51f8b76f4ec3fe9ef9bbc150 Mon Sep 17 00:00:00 2001
+From 6c4a1edc2ac8dedae718765c55bf9574003e7329 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Fri, 25 Sep 2015 12:31:11 +0200
 Subject: [PATCH] tests: Add scsi-disk test

0034-slirp-fix-clearing-ifq_so-from-pend.patch

@@ -1,81 +0,0 @@
-From dc8c3677038bae1bd06dca0167a790776f3e6b3b Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Fri, 25 Aug 2017 01:35:53 +0200
-Subject: [PATCH] slirp: fix clearing ifq_so from pending packets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The if_fastq and if_batchq contain not only packets, but queues of packets
-for the same socket. When sofree frees a socket, it thus has to clear ifq_so
-from all the packets from the queues, not only the first.
-
-Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-(cherry picked from commit 1201d308519f1e915866d7583d5136d03cc1d384)
-[BR: BSC#1056291 CVE-2017-13711]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- slirp/socket.c | 39 +++++++++++++++++++++++----------------
- 1 file changed, 23 insertions(+), 16 deletions(-)
-
-diff --git a/slirp/socket.c b/slirp/socket.c
-index ecec0295a9..cb7b5b608d 100644
---- a/slirp/socket.c
-+++ b/slirp/socket.c
-@@ -59,6 +59,27 @@ socreate(Slirp *slirp)
-   return(so);
- }
- 
-+/*
-+ * Remove references to so from the given message queue.
-+ */
-+static void
-+soqfree(struct socket *so, struct quehead *qh)
-+{
-+    struct mbuf *ifq;
-+
-+    for (ifq = (struct mbuf *) qh->qh_link;
-+             (struct quehead *) ifq != qh;
-+             ifq = ifq->ifq_next) {
-+        if (ifq->ifq_so == so) {
-+            struct mbuf *ifm;
-+            ifq->ifq_so = NULL;
-+            for (ifm = ifq->ifs_next; ifm != ifq; ifm = ifm->ifs_next) {
-+                ifm->ifq_so = NULL;
-+            }
-+        }
-+    }
-+}
-+
- /*
-  * remque and free a socket, clobber cache
-  */
-@@ -66,23 +87,9 @@ void
- sofree(struct socket *so)
- {
-   Slirp *slirp = so->slirp;
--  struct mbuf *ifm;
- 
--  for (ifm = (struct mbuf *) slirp->if_fastq.qh_link;
--       (struct quehead *) ifm != &slirp->if_fastq;
--       ifm = ifm->ifq_next) {
--    if (ifm->ifq_so == so) {
--      ifm->ifq_so = NULL;
--    }
--  }
--
--  for (ifm = (struct mbuf *) slirp->if_batchq.qh_link;
--       (struct quehead *) ifm != &slirp->if_batchq;
--       ifm = ifm->ifq_next) {
--    if (ifm->ifq_so == so) {
--      ifm->ifq_so = NULL;
--    }
--  }
-+  soqfree(so, &slirp->if_fastq);
-+  soqfree(so, &slirp->if_batchq);
- 
-   if (so->so_emu==EMU_RSH && so->extra) {
- 	sofree(so->extra);

0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch

@@ -1,4 +1,4 @@
-From 80810a703935dee520096b7cda635189472c755b Mon Sep 17 00:00:00 2001
+From 25e3e93ab685cabcaf987e493a6adfe5a463ce56 Mon Sep 17 00:00:00 2001
 From: Brijesh Singh <brijesh.singh@amd.com>
 Date: Tue, 15 Aug 2017 12:00:51 -0500
 Subject: [PATCH] target-i386/cpu: Add new EPYC CPU model

0035-chardev-baum-fix-baum-that-releases.patch

@@ -1,4 +1,4 @@
-From fbb04572c563144614fe3c3cb87c4e289c18e3d2 Mon Sep 17 00:00:00 2001
+From d131e1cccb06a09c867752ac4b9a075f4c97ffbc Mon Sep 17 00:00:00 2001
 From: Liang Yan <lyan@suse.com>
 Date: Fri, 22 Sep 2017 18:55:33 -0400
 Subject: [PATCH] chardev/baum: fix baum that releases brlapi twice

0035-s390-ccw-Fix-alignment-for-CCW1.patch

@@ -1,38 +0,0 @@
-From adee899fc239f9eca87881a7f6c6e1dae346922e Mon Sep 17 00:00:00 2001
-From: Farhan Ali <alifm@linux.vnet.ibm.com>
-Date: Fri, 25 Aug 2017 09:24:46 -0400
-Subject: [PATCH] s390-ccw: Fix alignment for CCW1
-
-The commit 198c0d1f9df8c4 s390x/css: check ccw address validity
-exposes an alignment issue in ccw bios.
-
-According to PoP the CCW must be doubleword aligned. Let's fix
-this in the bios.
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
-Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
-Reviewed-by: Eric Farman <farman@linux.vnet.ibm.com>
-Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
-Message-Id: <3ed8b810b6592daee6a775037ce21f850e40647d.1503667215.git.alifm@linux.vnet.ibm.com>
-Signed-off-by: Cornelia Huck <cohuck@redhat.com>
-(cherry picked from commit 3a1e4561ad63b303b092387ae006bd41468ece63)
-[BR: BSC#1056680]
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- pc-bios/s390-ccw/cio.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h
-index f5b4549ea3..55eaeee4b6 100644
---- a/pc-bios/s390-ccw/cio.h
-+++ b/pc-bios/s390-ccw/cio.h
-@@ -133,7 +133,7 @@ struct ccw1 {
-     __u8 flags;
-     __u16 count;
-     __u32 cda;
--} __attribute__ ((packed));
-+} __attribute__ ((packed, aligned(8)));
- 
- #define CCW_FLAG_DC              0x80
- #define CCW_FLAG_CC              0x40

0036-io-fix-temp-directory-used-by-test-.patch

@@ -1,4 +1,4 @@
-From 8b98dfae2517850aa45f247b6a58db0a3b8b63b3 Mon Sep 17 00:00:00 2001
+From 4d4549d686febaa531a0f2eef8cc0aa745ef1300 Mon Sep 17 00:00:00 2001
 From: "Daniel P. Berrange" <berrange@redhat.com>
 Date: Fri, 21 Jul 2017 12:47:39 +0100
 Subject: [PATCH] io: fix temp directory used by test-io-channel-tls test

0037-io-fix-check-for-handshake-completi.patch

@@ -1,4 +1,4 @@
-From 6b1a06c93a3ff4783c18148a6e538f89d6736e1a Mon Sep 17 00:00:00 2001
+From 0fa69eb51de581673ab4dd105be56fb59ef5556c Mon Sep 17 00:00:00 2001
 From: "Daniel P. Berrange" <berrange@redhat.com>
 Date: Tue, 29 Aug 2017 17:04:52 +0100
 Subject: [PATCH] io: fix check for handshake completion in TLS test

0038-crypto-fix-test-cert-generation-to-.patch

@@ -1,4 +1,4 @@
-From 8242424b356df5afb3bf862f8782e9273da3a60c Mon Sep 17 00:00:00 2001
+From 3578aeb73b6bfd11643fe65f34b454f4a6bd957e Mon Sep 17 00:00:00 2001
 From: "Daniel P. Berrange" <berrange@redhat.com>
 Date: Tue, 29 Aug 2017 17:03:30 +0100
 Subject: [PATCH] crypto: fix test cert generation to not use SHA1 algorithm
@@ -15,7 +15,6 @@ Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
 [BR: We're getting failures in qemu-testsuite. This fix either resolves
 that failure, or has been identified as being a qemu-testsuite failure
 fix in related code]
-
 Signed-off-by: Bruce Rogers <brogers@suse.com>
 ---
  tests/crypto-tls-x509-helpers.c | 3 ++-

0038-s390x-ais-for-2.10-stable-disable-a.patch

@@ -1,40 +0,0 @@
-From 9422f33e1efad3bfbed1feec544a2989f3ce1d9e Mon Sep 17 00:00:00 2001
-From: Christian Borntraeger <borntraeger@de.ibm.com>
-Date: Thu, 21 Sep 2017 16:08:34 +0200
-Subject: [PATCH] s390x/ais: for 2.10 stable: disable ais facility
-
-The migration interface for ais was introduced with kernel 4.13
-but the capability itself had been active since 4.12. As migration
-support is considered necessary lets disable ais in the 2.10
-stable version. A proper fix and re-enablement will be done
-for qemu 2.11.
-
-Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-Message-Id: <20170921140834.14233-2-borntraeger@de.ibm.com>
-Signed-off-by: Cornelia Huck <cohuck@redhat.com>
-(cherry picked from commit 3f2d07b3b01ea61126b382633ab4006320923048)
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- target/s390x/kvm.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
-index c4c5791d27..eb0dbb338b 100644
---- a/target/s390x/kvm.c
-+++ b/target/s390x/kvm.c
-@@ -308,8 +308,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
-         }
-     }
- 
--    /* Try to enable AIS facility */
--    kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0);
-+    /*
-+     * The migration interface for ais was introduced with kernel 4.13
-+     * but the capability itself had been active since 4.12. As migration
-+     * support is considered necessary let's disable ais in the 2.10
-+     * machine.
-+     */
-+    /* kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0); */
- 
-     qemu_mutex_init(&qemu_sigp_mutex);
- 

0039-s390x-cpumodel-remove-ais-from-z14-.patch

@@ -1,32 +0,0 @@
-From 00af5eb0b1fe96b04183e7f2e853da7b41aca156 Mon Sep 17 00:00:00 2001
-From: Christian Borntraeger <borntraeger@de.ibm.com>
-Date: Wed, 27 Sep 2017 09:20:28 +0200
-Subject: [PATCH] s390x/cpumodel: remove ais from z14 default model-> also for
- 2.10.1
-
-We disabled ais for 2.10, so let's also remove it from the z14
-default model.
-
-Fixes: 3f2d07b3b01e ("s390x/ais: for 2.10 stable: disable ais facility")
-CC: qemu-stable@nongnu.org
-Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-Message-Id: <20170927072030.35737-2-borntraeger@de.ibm.com>
-Signed-off-by: Cornelia Huck <cohuck@redhat.com>
-(cherry picked from commit 9dacc908462693719d84ec594e839434959cf6f1)
-Signed-off-by: Bruce Rogers <brogers@suse.com>
----
- target/s390x/gen-features.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
-index c8dc104bc1..68e6c31b4b 100644
---- a/target/s390x/gen-features.c
-+++ b/target/s390x/gen-features.c
-@@ -527,7 +527,6 @@ static uint16_t default_GEN13_GA1[] = {
- #define default_GEN13_GA2 EmptyFeat
- 
- static uint16_t default_GEN14_GA1[] = {
--    S390_FEAT_ADAPTER_INT_SUPPRESSION,
-     S390_FEAT_INSTRUCTION_EXEC_PROT,
-     S390_FEAT_GUARDED_STORAGE,
-     S390_FEAT_VECTOR_PACKED_DECIMAL,

0039-vhost-user-disable-the-broken-subpr.patch

@@ -0,0 +1,78 @@
+From dd7d5241682092e93714f73ccdfc844a0058cca6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
+Date: Tue, 5 Sep 2017 15:06:02 -0300
+Subject: [PATCH] vhost-user: disable the *broken* subprocess tests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+tests/vhost-user-test keeps failing on build-system since Aug 15:
+
+  ERROR:tests/vhost-user-test.c:835:test_flags_mismatch: child process (/i386/vhost-user/flags-mismatch/subprocess [4836]) failed unexpectedly
+...
+  ERROR:tests/vhost-user-test.c:807:test_connect_fail: child process (/x86_64/vhost-user/connect-fail/subprocess [58910]) failed unexpectedly
+
+Suggested-by: Peter Maydell <peter.maydell@linaro.org>
+Suggested-by: Daniel P. Berrange <berrange@redhat.com>
+Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Message-id: 20170905180602.28698-1-f4bug@amsat.org
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+(cherry picked from commit 20784087eb875e22cf0021989e61716304b63c84)
+[BR: We're getting failures in qemu-testsuite. This fix either resolves
+that failure, or has been identified as being a qemu-testsuite failure
+fix in related code]
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ tests/vhost-user-test.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
+index d4da09f147..4b98018478 100644
+--- a/tests/vhost-user-test.c
++++ b/tests/vhost-user-test.c
+@@ -31,6 +31,8 @@
+ #include <linux/virtio_net.h>
+ #include <sys/vfs.h>
+ 
++#define VHOST_USER_NET_TESTS_WORKING 0 /* broken as of 2.10.0 */
++
+ /* GLIB version compatibility flags */
+ #if !GLIB_CHECK_VERSION(2, 26, 0)
+ #define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT(1000000))
+@@ -472,11 +474,6 @@ static void test_server_listen(TestServer *server)
+     test_server_create_chr(server, ",server,nowait");
+ }
+ 
+-static inline void test_server_connect(TestServer *server)
+-{
+-    test_server_create_chr(server, ",reconnect=1");
+-}
+-
+ #define GET_QEMU_CMD(s)                                         \
+     g_strdup_printf(QEMU_CMD, 512, 512, (root), (s)->chr_name,  \
+                     (s)->socket_path, "", (s)->chr_name)
+@@ -722,7 +719,12 @@ static void wait_for_rings_started(TestServer *s, size_t count)
+     g_mutex_unlock(&s->data_mutex);
+ }
+ 
+-#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
++#if VHOST_USER_NET_TESTS_WORKING && defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
++static inline void test_server_connect(TestServer *server)
++{
++    test_server_create_chr(server, ",reconnect=1");
++}
++
+ static gboolean
+ reconnect_cb(gpointer user_data)
+ {
+@@ -962,7 +964,8 @@ int main(int argc, char **argv)
+     qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest_mem);
+     qtest_add_func("/vhost-user/migrate", test_migrate);
+     qtest_add_func("/vhost-user/multiqueue", test_multiqueue);
+-#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
++
++#if VHOST_USER_NET_TESTS_WORKING && defined(CONFIG_HAS_GLIB_SUBPROCESS_TESTS)
+     qtest_add_func("/vhost-user/reconnect/subprocess",
+                    test_reconnect_subprocess);
+     qtest_add_func("/vhost-user/reconnect", test_reconnect);

qemu-2.10.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55d81ac987a4821d2744359c026d766459319ba9c013746570369068d93ff335
-size 25040324

qemu-2.10.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dd51a908fc68c7d935b0b31fb184c5669bc23b5a1b081816e824714f2a11caa
+size 24979688

qemu-linux-user.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Oct  3 21:07:30 UTC 2017 - brogers@suse.com
+
+- Update to v2.10.1 a stable, bug-fix-only release
+* Patches dropped (upstream):
+  0034-slirp-fix-clearing-ifq_so-from-pend.patch
+  0035-s390-ccw-Fix-alignment-for-CCW1.patch
+  0038-s390x-ais-for-2.10-stable-disable-a.patch
+  0039-s390x-cpumodel-remove-ais-from-z14-.patch
+* Patches renamed:
+  0036-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  -> 0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  0037-chardev-baum-fix-baum-that-releases.patch
+  -> 0035-chardev-baum-fix-baum-that-releases.patch
+  0040-io-fix-temp-directory-used-by-test-.patch
+  -> 0036-io-fix-temp-directory-used-by-test-.patch
+  0041-io-fix-check-for-handshake-completi.patch
+  -> 0037-io-fix-check-for-handshake-completi.patch
+  0042-crypto-fix-test-cert-generation-to-.patch
+  -> 0038-crypto-fix-test-cert-generation-to-.patch
+  0043-vhost-user-disable-the-broken-subpr.patch
+  -> 0039-vhost-user-disable-the-broken-subpr.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10
+
 -------------------------------------------------------------------
 Mon Oct  2 20:26:18 UTC 2017 - brogers@suse.com
 
@@ -6,6 +30,7 @@ Mon Oct  2 20:26:18 UTC 2017 - brogers@suse.com
   0040-io-fix-temp-directory-used-by-test-.patch
   0041-io-fix-check-for-handshake-completi.patch
   0042-crypto-fix-test-cert-generation-to-.patch
+  0043-vhost-user-disable-the-broken-subpr.patch
 
 -------------------------------------------------------------------
 Thu Sep 28 21:56:47 UTC 2017 - brogers@suse.com

qemu-linux-user.spec

@@ -21,9 +21,9 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.10.0
+Version:        2.10.1
 Release:        0
-Source:         qemu-2.10.0.tar.xz
+Source:         qemu-2.10.1.tar.xz
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
@@ -59,15 +59,12 @@ Patch0030:      0030-test-string-input-visitor-Add-int-t.patch
 Patch0031:      0031-test-string-input-visitor-Add-uint6.patch
 Patch0032:      0032-tests-Add-QOM-property-unit-tests.patch
 Patch0033:      0033-tests-Add-scsi-disk-test.patch
-Patch0034:      0034-slirp-fix-clearing-ifq_so-from-pend.patch
+Patch0034:      0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
-Patch0035:      0035-s390-ccw-Fix-alignment-for-CCW1.patch
+Patch0035:      0035-chardev-baum-fix-baum-that-releases.patch
-Patch0036:      0036-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+Patch0036:      0036-io-fix-temp-directory-used-by-test-.patch
-Patch0037:      0037-chardev-baum-fix-baum-that-releases.patch
+Patch0037:      0037-io-fix-check-for-handshake-completi.patch
-Patch0038:      0038-s390x-ais-for-2.10-stable-disable-a.patch
+Patch0038:      0038-crypto-fix-test-cert-generation-to-.patch
-Patch0039:      0039-s390x-cpumodel-remove-ais-from-z14-.patch
+Patch0039:      0039-vhost-user-disable-the-broken-subpr.patch
-Patch0040:      0040-io-fix-temp-directory-used-by-test-.patch
-Patch0041:      0041-io-fix-check-for-handshake-completi.patch
-Patch0042:      0042-crypto-fix-test-cert-generation-to-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 Source400:      update_git.sh
@@ -120,7 +117,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.10.0
+%setup -q -n qemu-2.10.1
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -160,9 +157,6 @@ run cross-architecture builds.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
 
 %build
 ./configure \

qemu-linux-user.spec.in

@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         qemu-2.10.0.tar.xz
+Source:         qemu-2.10.1.tar.xz
 # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
@@ -79,7 +79,7 @@ emulations. This can be used together with the OBS build script to
 run cross-architecture builds.
 
 %prep
-%setup -q -n qemu-2.10.0
+%setup -q -n qemu-2.10.1
 PATCH_EXEC
 
 %build

qemu-testsuite.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Oct  3 21:07:26 UTC 2017 - brogers@suse.com
+
+- Update to v2.10.1, a stable, bug-fix-only release
+* fixes bsc#1056386 CVE-2017-13673, bsc#1056334 CVE-2017-13672,
+  bsc#1057585 CVE-2017-14167
+* Patches dropped (upstream):
+  0034-slirp-fix-clearing-ifq_so-from-pend.patch
+  0035-s390-ccw-Fix-alignment-for-CCW1.patch
+  0038-s390x-ais-for-2.10-stable-disable-a.patch
+  0039-s390x-cpumodel-remove-ais-from-z14-.patch
+* Patches renamed:
+  0036-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  -> 0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  0037-chardev-baum-fix-baum-that-releases.patch
+  -> 0035-chardev-baum-fix-baum-that-releases.patch
+  0040-io-fix-temp-directory-used-by-test-.patch
+  -> 0036-io-fix-temp-directory-used-by-test-.patch
+  0041-io-fix-check-for-handshake-completi.patch
+  -> 0037-io-fix-check-for-handshake-completi.patch
+  0042-crypto-fix-test-cert-generation-to-.patch
+  -> 0038-crypto-fix-test-cert-generation-to-.patch
+  0043-vhost-user-disable-the-broken-subpr.patch
+  -> 0039-vhost-user-disable-the-broken-subpr.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10
+
 -------------------------------------------------------------------
 Mon Oct  2 20:26:13 UTC 2017 - brogers@suse.com
 
@@ -5,6 +31,7 @@ Mon Oct  2 20:26:13 UTC 2017 - brogers@suse.com
   0040-io-fix-temp-directory-used-by-test-.patch
   0041-io-fix-check-for-handshake-completi.patch
   0042-crypto-fix-test-cert-generation-to-.patch
+  0043-vhost-user-disable-the-broken-subpr.patch
 - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10
 
 -------------------------------------------------------------------

qemu-testsuite.spec

@@ -116,10 +116,10 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.10.0
+Version:        2.10.1
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.10.0.tar.xz
+Source:         http://wiki.qemu.org/download/qemu-2.10.1.tar.xz
-Source99:       http://wiki.qemu.org/download/qemu-2.10.0.tar.xz.sig
+Source99:       http://wiki.qemu.org/download/qemu-2.10.1.tar.xz.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -171,15 +171,12 @@ Patch0030:      0030-test-string-input-visitor-Add-int-t.patch
 Patch0031:      0031-test-string-input-visitor-Add-uint6.patch
 Patch0032:      0032-tests-Add-QOM-property-unit-tests.patch
 Patch0033:      0033-tests-Add-scsi-disk-test.patch
-Patch0034:      0034-slirp-fix-clearing-ifq_so-from-pend.patch
+Patch0034:      0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
-Patch0035:      0035-s390-ccw-Fix-alignment-for-CCW1.patch
+Patch0035:      0035-chardev-baum-fix-baum-that-releases.patch
-Patch0036:      0036-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+Patch0036:      0036-io-fix-temp-directory-used-by-test-.patch
-Patch0037:      0037-chardev-baum-fix-baum-that-releases.patch
+Patch0037:      0037-io-fix-check-for-handshake-completi.patch
-Patch0038:      0038-s390x-ais-for-2.10-stable-disable-a.patch
+Patch0038:      0038-crypto-fix-test-cert-generation-to-.patch
-Patch0039:      0039-s390x-cpumodel-remove-ais-from-z14-.patch
+Patch0039:      0039-vhost-user-disable-the-broken-subpr.patch
-Patch0040:      0040-io-fix-temp-directory-used-by-test-.patch
-Patch0041:      0041-io-fix-check-for-handshake-completi.patch
-Patch0042:      0042-crypto-fix-test-cert-generation-to-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -828,7 +825,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.10.0
+%setup -q -n qemu-2.10.1
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -868,9 +865,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
 
 pushd roms/ipxe
 %patch1100 -p1

qemu.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Oct  3 21:07:26 UTC 2017 - brogers@suse.com
+
+- Update to v2.10.1, a stable, bug-fix-only release
+* fixes bsc#1056386 CVE-2017-13673, bsc#1056334 CVE-2017-13672,
+  bsc#1057585 CVE-2017-14167
+* Patches dropped (upstream):
+  0034-slirp-fix-clearing-ifq_so-from-pend.patch
+  0035-s390-ccw-Fix-alignment-for-CCW1.patch
+  0038-s390x-ais-for-2.10-stable-disable-a.patch
+  0039-s390x-cpumodel-remove-ais-from-z14-.patch
+* Patches renamed:
+  0036-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  -> 0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+  0037-chardev-baum-fix-baum-that-releases.patch
+  -> 0035-chardev-baum-fix-baum-that-releases.patch
+  0040-io-fix-temp-directory-used-by-test-.patch
+  -> 0036-io-fix-temp-directory-used-by-test-.patch
+  0041-io-fix-check-for-handshake-completi.patch
+  -> 0037-io-fix-check-for-handshake-completi.patch
+  0042-crypto-fix-test-cert-generation-to-.patch
+  -> 0038-crypto-fix-test-cert-generation-to-.patch
+  0043-vhost-user-disable-the-broken-subpr.patch
+  -> 0039-vhost-user-disable-the-broken-subpr.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10
+
 -------------------------------------------------------------------
 Mon Oct  2 20:26:13 UTC 2017 - brogers@suse.com
 
@@ -5,6 +31,7 @@ Mon Oct  2 20:26:13 UTC 2017 - brogers@suse.com
   0040-io-fix-temp-directory-used-by-test-.patch
   0041-io-fix-check-for-handshake-completi.patch
   0042-crypto-fix-test-cert-generation-to-.patch
+  0043-vhost-user-disable-the-broken-subpr.patch
 - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10
 
 -------------------------------------------------------------------

qemu.spec

@@ -116,10 +116,10 @@ Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
 License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
-Version:        2.10.0
+Version:        2.10.1
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.10.0.tar.xz
+Source:         http://wiki.qemu.org/download/qemu-2.10.1.tar.xz
-Source99:       http://wiki.qemu.org/download/qemu-2.10.0.tar.xz.sig
+Source99:       http://wiki.qemu.org/download/qemu-2.10.1.tar.xz.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -171,15 +171,12 @@ Patch0030:      0030-test-string-input-visitor-Add-int-t.patch
 Patch0031:      0031-test-string-input-visitor-Add-uint6.patch
 Patch0032:      0032-tests-Add-QOM-property-unit-tests.patch
 Patch0033:      0033-tests-Add-scsi-disk-test.patch
-Patch0034:      0034-slirp-fix-clearing-ifq_so-from-pend.patch
+Patch0034:      0034-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
-Patch0035:      0035-s390-ccw-Fix-alignment-for-CCW1.patch
+Patch0035:      0035-chardev-baum-fix-baum-that-releases.patch
-Patch0036:      0036-target-i386-cpu-Add-new-EPYC-CPU-mo.patch
+Patch0036:      0036-io-fix-temp-directory-used-by-test-.patch
-Patch0037:      0037-chardev-baum-fix-baum-that-releases.patch
+Patch0037:      0037-io-fix-check-for-handshake-completi.patch
-Patch0038:      0038-s390x-ais-for-2.10-stable-disable-a.patch
+Patch0038:      0038-crypto-fix-test-cert-generation-to-.patch
-Patch0039:      0039-s390x-cpumodel-remove-ais-from-z14-.patch
+Patch0039:      0039-vhost-user-disable-the-broken-subpr.patch
-Patch0040:      0040-io-fix-temp-directory-used-by-test-.patch
-Patch0041:      0041-io-fix-check-for-handshake-completi.patch
-Patch0042:      0042-crypto-fix-test-cert-generation-to-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -828,7 +825,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.10.0
+%setup -q -n qemu-2.10.1
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
@@ -868,9 +865,6 @@ This package provides a service file for starting and stopping KSM.
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
-%patch0040 -p1
-%patch0041 -p1
-%patch0042 -p1
 
 pushd roms/ipxe
 %patch1100 -p1

qemu.spec.in

@@ -118,8 +118,8 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-2.10.0.tar.xz
+Source:         http://wiki.qemu.org/download/qemu-2.10.1.tar.xz
-Source99:       http://wiki.qemu.org/download/qemu-2.10.0.tar.xz.sig
+Source99:       http://wiki.qemu.org/download/qemu-2.10.1.tar.xz.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat
@@ -787,7 +787,7 @@ This package provides a service file for starting and stopping KSM.
 %endif # !qemu-testsuite
 
 %prep
-%setup -q -n qemu-2.10.0
+%setup -q -n qemu-2.10.1
 PATCH_EXEC
 
 pushd roms/ipxe

update_git.sh

@@ -14,7 +14,7 @@ set -e
 GIT_TREE=git://github.com/openSUSE/qemu.git
 GIT_LOCAL_TREE=~/git/qemu-opensuse
 GIT_BRANCH=opensuse-2.10
-GIT_UPSTREAM_TAG=v2.10.0
+GIT_UPSTREAM_TAG=v2.10.1
 GIT_DIR=/dev/shm/qemu-factory-git-dir
 CMP_DIR=/dev/shm/qemu-factory-cmp-dir