From 46ea403d2f0e91055c2295ba4a43a5a22e9ff026 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Dec 10 2019 21:50:49 +0000 Subject: Update to qemu-4.2.0 rc5 Signed-off-by: Cole Robinson --- diff --git a/.gitignore b/.gitignore index f0a4eee..4466667 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /qemu-4.1.0.tar.xz /qemu-4.2.0-rc1.tar.xz /qemu-4.2.0-rc2.tar.xz +/qemu-4.2.0-rc5.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 deleted file mode 100644 index a88eb75..0000000 --- a/0002-pseries-disable-migration-test-if-dev-kvm-cannot-be-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5c84a2c439afb2a6a5aa69ccd2d7e2ecdb1d18cf Mon Sep 17 00:00:00 2001 -Message-Id: <5c84a2c439afb2a6a5aa69ccd2d7e2ecdb1d18cf.1574270987.git.crobinso@redhat.com> -From: Laurent Vivier -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 -Signed-off-by: Laurent Vivier -Signed-off-by: Cole Robinson ---- - 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 6e9d20f..adda418 100644 --- a/qemu.spec +++ b/qemu.spec @@ -151,7 +151,7 @@ %{obsoletes_block_rbd} # Release candidate version tracking -%global rcver rc2 +%global rcver rc5 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} @@ -161,7 +161,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 4.2.0 -Release: 0.3%{?rcrel}%{?dist} +Release: 0.4%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -170,8 +170,6 @@ 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 @@ -1889,6 +1887,9 @@ getent passwd qemu >/dev/null || \ %changelog +* Tue Dec 10 2019 Cole Robinson - 4.2.0-0.4.rc5 +- Update to qemu-4.2.0 rc5 + * Mon Dec 2 2019 Daniel P. Berrangé - 2:4.2.0-0.3.rc2 - Disable RDMA on 32-bit arm (rhbz #1778517) diff --git a/sources b/sources index 048bffd..0d2a5b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-4.2.0-rc2.tar.xz) = a02aea8282c3ca49f290180b9749e9583f1e3bf47f86672ab4ed663ec310c491a0a3860192db1b5582737e4c57d14ad3a59f3e85d82c8d7848d3742b3fbd224f +SHA512 (qemu-4.2.0-rc5.tar.xz) = 455a5600353db68da2fea891e101b268cd87c23aa872ae2b86ab93e46a7024a093227110a3a1d8fea79af0830aa27eaf16275bcb6e06c47a87046287682fe716