From 27bca4038cb9c76aea625a94851ae18f77f64193 Mon Sep 17 00:00:00 2001 From: Eduardo Lima (Etrunko) Date: Apr 19 2023 15:42:15 +0000 Subject: qemu-7.2.1-1 - Update to QEMU upstream release 7.2.1 --- diff --git a/0005-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch b/0005-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch deleted file mode 100644 index 419a284..0000000 --- a/0005-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch +++ /dev/null @@ -1,45 +0,0 @@ -From db788c896eb1378ebc1f20dcc4954616a7631919 Mon Sep 17 00:00:00 2001 -From: Stefan Hajnoczi -Date: Tue, 7 Feb 2023 15:37:16 -0500 -Subject: [PATCH 5/7] block: fix detect-zeroes= with BDRV_REQ_REGISTERED_BUF - -When a write request is converted into a write zeroes request by the -detect-zeroes= feature, it is no longer associated with an I/O buffer. -The BDRV_REQ_REGISTERED_BUF flag doesn't make sense without an I/O -buffer and must be cleared because bdrv_co_do_pwrite_zeroes() fails with --EINVAL when it's set. - -Fiona Ebner bisected and diagnosed this QEMU 7.2 -regression where writes containing zeroes to a blockdev with -discard=unmap,detect-zeroes=unmap fail. - -Buglink: https://gitlab.com/qemu-project/qemu/-/issues/1404 -Fixes: e8b6535533be ("block: add BDRV_REQ_REGISTERED_BUF request flag") -Tested-by: Fiona Ebner -Cc: qemu-stable@nongnu.org -Reviewed-by: Eric Blake -Reviewed-by: Hanna Czenczek -Signed-off-by: Stefan Hajnoczi -Message-Id: <20230207203719.242926-2-stefanha@redhat.com> -(cherry picked from commit 3c5867156eb81c7c71611d078b2c5c2c863f884a) ---- - block/io.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/block/io.c b/block/io.c -index b9424024f9..bbaa0d1b2d 100644 ---- a/block/io.c -+++ b/block/io.c -@@ -2087,6 +2087,9 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child, - if (bs->detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP) { - flags |= BDRV_REQ_MAY_UNMAP; - } -+ -+ /* Can't use optimization hint with bufferless zero write */ -+ flags &= ~BDRV_REQ_REGISTERED_BUF; - } - - if (ret < 0) { --- -2.37.3 - diff --git a/qemu.spec b/qemu.spec index 218aee5..ee9747e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -321,11 +321,11 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 7 +%global baserelease 1 Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 7.2.0 +Version: 7.2.1 Release: %{baserelease}%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY @@ -350,8 +350,6 @@ Patch: 0002-tests-Disable-pci_virtio_vga-for-ppc64.patch # Fix compat with kernel-headers >= 6.1 Patch: 0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch Patch: 0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch -# Fix virtio-blk-pci detect-zeroes=unmap (RHBZ#2173357) -Patch: 0005-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch # Fix build with glib2 2.75.3 # https://bugzilla.redhat.com/show_bug.cgi?id=2173639 # https://gitlab.com/qemu-project/qemu/-/issues/1518 @@ -2788,6 +2786,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Apr 19 2023 Eduardo Lima (Etrunko) - 7.2.1-1 +- Rebase to qemu 7.2.1 + * Mon Feb 27 2023 Richard W.M. Jones - 7.2.0-7 - Fix virtio-blk-pci detect-zeroes=unmap (RHBZ#2173357) - Fix build with glib2 2.75.3 (RHBZ#2173639) diff --git a/sources b/sources index c45f059..c94b8cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-7.2.0.tar.xz) = f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13 +SHA512 (qemu-7.2.1.tar.xz) = e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a