From 7b9b67b1ec22ed8928fe54f03f38f76f3b6d0697 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Apr 05 2018 18:25:31 +0000 Subject: Update to qemu-2.12.0-rc2 Drop upstreamed riscv patch --- diff --git a/.gitignore b/.gitignore index 12ede74..4fa160d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /qemu-2.11.1.tar.xz /qemu-2.12.0-rc0.tar.xz /qemu-2.12.0-rc1.tar.xz +/qemu-2.12.0-rc2.tar.xz diff --git a/0002-riscv-force-float-save.patch b/0002-riscv-force-float-save.patch deleted file mode 100644 index a3e69f6..0000000 --- a/0002-riscv-force-float-save.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41.old/target/riscv/op_helper.c riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41/target/riscv/op_helper.c ---- riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41.old/target/riscv/op_helper.c 2018-03-02 13:29:21.000000000 +0000 -+++ riscv-qemu-b6e0a38a922005d4015e2fdb42e8a783b3cc8e41/target/riscv/op_helper.c 2018-03-10 21:21:48.999120773 +0000 -@@ -144,6 +144,7 @@ - } - - mstatus = (mstatus & ~mask) | (val_to_write & mask); -+ if (mstatus & MSTATUS_FS) mstatus |= MSTATUS_FS; /* FP is always dirty if enabled */ - int dirty = (mstatus & MSTATUS_FS) == MSTATUS_FS; - dirty |= (mstatus & MSTATUS_XS) == MSTATUS_XS; - mstatus = set_field(mstatus, MSTATUS_SD, dirty); diff --git a/qemu.spec b/qemu.spec index b2b5d5b..1c00383 100644 --- a/qemu.spec +++ b/qemu.spec @@ -94,7 +94,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release} # Release candidate version tracking -%global rcver rc1 +%global rcver rc2 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} @@ -104,7 +104,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu Version: 2.12.0 -Release: 0.5%{?rcrel}%{?dist} +Release: 0.6%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -139,9 +139,6 @@ Source22: 95-kvm-ppc64-memlock.conf # Avoid breakage in tests due to stricter crypto policies Patch0001: 0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch -# RISC-V fix from rich: -# https://bugzilla.redhat.com/show_bug.cgi?id=1551452#c7 -Patch0002: 0002-riscv-force-float-save.patch # documentation deps BuildRequires: texinfo @@ -1669,6 +1666,9 @@ getent passwd qemu >/dev/null || \ %changelog +* Thu Apr 05 2018 Cole Robinson - 2:2.12.0-0.6.rc2 +- Update to qemu-2.12.0-rc2 + * Wed Mar 28 2018 Cole Robinson - 2:2.12.0-0.5.rc1 - Update to qemu-2.12.0-rc1 diff --git a/sources b/sources index 64fbf57..31f0d55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-2.12.0-rc1.tar.xz) = 925c89109bbedbbf64d65d4935eababf6bc8c8d8618a3cfafa98e3bdf6dcc434d26bb1f204ccd83aac6bb7a8d577d7765a989e655db13e840d872ff3f6019fa1 +SHA512 (qemu-2.12.0-rc2.tar.xz) = 0dd0816e6b2f21585f574f6f4b7c510e0fb165f4c68ff0837a137bcb5c6851776d2077d44325ae4e0fbf2c98abb9433bf378234723b571b41c9b9e247d3411db