From 6732563c656b4892975b019cc63db37059165683 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Nov 20 2019 18:06:13 +0000
Subject: Update to qemu-4.2.0 rc2


Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index e9e9dc2..f0a4eee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /qemu-4.1.0-rc2.tar.xz
 /qemu-4.1.0.tar.xz
 /qemu-4.2.0-rc1.tar.xz
+/qemu-4.2.0-rc2.tar.xz
diff --git a/0002-pseries-disable-migration-test-if-dev-kvm-cannot-be-.patch b/0002-pseries-disable-migration-test-if-dev-kvm-cannot-be-.patch
new file mode 100644
index 0000000..a88eb75
--- /dev/null
+++ b/0002-pseries-disable-migration-test-if-dev-kvm-cannot-be-.patch
@@ -0,0 +1,49 @@
+From 5c84a2c439afb2a6a5aa69ccd2d7e2ecdb1d18cf Mon Sep 17 00:00:00 2001
+Message-Id: <5c84a2c439afb2a6a5aa69ccd2d7e2ecdb1d18cf.1574270987.git.crobinso@redhat.com>
+From: Laurent Vivier <lvivier@redhat.com>
+Date: Wed, 20 Nov 2019 18:09:55 +0100
+Subject: [PATCH] pseries: disable migration-test if /dev/kvm cannot be used
+
+On ppc64, migration-test only works with kvm_hv, and we already
+have a check to verify the module is loaded.
+
+kvm_hv module can be loaded in memory and /sys/module/kvm_hv exists,
+but on some systems (like build systems) /dev/kvm can be missing
+(by administrators choice).
+
+And as kvm_hv exists test-migration is started but QEMU falls back to
+TCG because it cannot be used:
+
+    Could not access KVM kernel module: No such file or directory
+    failed to initialize KVM: No such file or directory
+    Back to tcg accelerator
+
+And as the test is done with TCG, it fails.
+
+As for s390x, we must check for the existence and the access rights
+of /dev/kvm.
+
+Reported-by: Cole Robinson <crobinso@redhat.com>
+Signed-off-by: Laurent Vivier <lvivier@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ tests/migration-test.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/migration-test.c b/tests/migration-test.c
+index ac780dffda..2b25ba6d77 100644
+--- a/tests/migration-test.c
++++ b/tests/migration-test.c
+@@ -1349,7 +1349,8 @@ int main(int argc, char **argv)
+      * some reason)
+      */
+     if (g_str_equal(qtest_get_arch(), "ppc64") &&
+-        access("/sys/module/kvm_hv", F_OK)) {
++        (access("/sys/module/kvm_hv", F_OK) ||
++         access("/dev/kvm", R_OK | W_OK))) {
+         g_test_message("Skipping test: kvm_hv not available");
+         return g_test_run();
+     }
+-- 
+2.23.0
+
diff --git a/qemu.spec b/qemu.spec
index f03fabf..58ae10a 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -145,7 +145,7 @@
 %{obsoletes_block_rbd}
 
 # Release candidate version tracking
-%global rcver rc1
+%global rcver rc2
 %if 0%{?rcver:1}
 %global rcrel .%{rcver}
 %global rcstr -%{rcver}
@@ -155,7 +155,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 4.2.0
-Release: 0.1%{?rcrel}%{?dist}
+Release: 0.2%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -164,6 +164,8 @@ Source0: http://wiki.qemu-project.org/download/%{name}-%{version}%{?rcstr}.tar.x
 
 # Fix a test suite error
 Patch1: 0001-tests-fix-modules-test-duplicate-test-case-error.patch
+# Properly skip pseries test on not-kvm
+Patch2: 0002-pseries-disable-migration-test-if-dev-kvm-cannot-be-.patch
 
 # guest agent service
 Source10: qemu-guest-agent.service
@@ -1882,6 +1884,9 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Wed Nov 20 2019 Cole Robinson <aintdiscole@gmail.com> - 2:4.2.0-0.2.rc2
+- Update to qemu-4.2.0 rc2
+
 * Tue Nov 12 2019 Cole Robinson <aintdiscole@gmail.com> - 2:4.2.0-0.1.rc1
 - Update to qemu-4.2.0 rc1
 
diff --git a/sources b/sources
index 310b89f..048bffd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qemu-4.2.0-rc1.tar.xz) = 8ad5e0472fd384a9ba03b2e8fbb1e887169abb47a50a3f130b1943b39f45677a9e65ca5d1deb96338a5b3c3953db67f50e194a6763e9121c0eb5f620896162a9
+SHA512 (qemu-4.2.0-rc2.tar.xz) = a02aea8282c3ca49f290180b9749e9583f1e3bf47f86672ab4ed663ec310c491a0a3860192db1b5582737e4c57d14ad3a59f3e85d82c8d7848d3742b3fbd224f