qemu-7.2.0-6

The libblkio package was added to Fedora. It is now possible to enable
the blkio block driver in QEMU.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch

@@ -0,0 +1,67 @@
+From ebff02a43374c1138d4f8b2c07d2088a3921c288 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 10 Jan 2023 12:37:14 -0500
+Subject: [PATCH 1/2] Revert "linux-user: add more compat ioctl definitions"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ linux-user/syscall.c | 25 -------------------------
+ 1 file changed, 25 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 1f8c10f8ef..9c1e9555e1 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include <linux/fs.h>
+ #endif
+-- 
+2.38.1
+

0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch

@@ -0,0 +1,76 @@
+From f0f11a1435802b5c8ee8337a7b0c0f337d8f9936 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 10 Jan 2023 12:37:25 -0500
+Subject: [PATCH 2/2] Revert "linux-user: fix compat with glibc >= 2.36
+ sys/mount.h"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ linux-user/syscall.c | 18 ------------------
+ meson.build          |  2 --
+ 2 files changed, 20 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 9c1e9555e1..f2b7634f5e 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -95,25 +95,7 @@
+ #include <linux/soundcard.h>
+ #include <linux/kd.h>
+ #include <linux/mtio.h>
+-
+-#ifdef HAVE_SYS_MOUNT_FSCONFIG
+-/*
+- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
+- * which in turn prevents use of linux/fs.h. So we have to
+- * define the constants ourselves for now.
+- */
+-#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
+-#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
+-#define FS_IOC_GETVERSION              _IOR('v', 1, long)
+-#define FS_IOC_SETVERSION              _IOW('v', 2, long)
+-#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
+-#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
+-#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+-#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+-#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-#else
+ #include <linux/fs.h>
+-#endif
+ #include <linux/fd.h>
+ #if defined(CONFIG_FIEMAP)
+ #include <linux/fiemap.h>
+diff --git a/meson.build b/meson.build
+index 175517eafd..32fed7ea6e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2039,8 +2039,6 @@ config_host_data.set('HAVE_OPTRESET',
+                      cc.has_header_symbol('getopt.h', 'optreset'))
+ config_host_data.set('HAVE_IPPROTO_MPTCP',
+                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
+-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
+-                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
+ 
+ # has_member
+ config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
+-- 
+2.38.1
+

0010-Skip-iotests-entirely.patch

@@ -1,26 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Sun, 5 Jun 2022 12:48:29 -0400
-Subject: [PATCH] Skip iotests entirely
-Content-type: text/plain
-
-Getting sporadic failures like described here:
-https://www.mail-archive.com/qemu-devel@nongnu.org/msg887683.html
-
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
----
- tests/check-block.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/check-block.sh b/tests/check-block.sh
-index f59496396c..09cc735da4 100755
---- a/tests/check-block.sh
-+++ b/tests/check-block.sh
-@@ -50,6 +50,8 @@ fi
- 
- cd tests/qemu-iotests
- 
-+exit 0
-+
- # QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
- export QEMU_CHECK_BLOCK_AUTO=1
- export PYTHONUTF8=1

qemu.spec

@@ -6,7 +6,7 @@
 %global libfdt_version 1.6.0
 %global libseccomp_version 2.4.0
 %global libusbx_version 1.0.23
-%global meson_version 0.59.3
+%global meson_version 0.61.3
 %global usbredir_version 0.7.1
 %global ipxe_version 20200823-5.git4bd064de
 
@@ -163,6 +163,7 @@
 %global qemudocdir %{_docdir}/%{name}
 %define evr %{epoch}:%{version}-%{release}
 
+%define requires_block_blkio Requires: %{name}-block-blkio = %{evr}
 %define requires_block_curl Requires: %{name}-block-curl = %{evr}
 %define requires_block_dmg Requires: %{name}-block-dmg = %{evr}
 %if %{have_block_gluster}
@@ -252,6 +253,7 @@
 %endif
 
 %global requires_all_modules \
+%{requires_block_blkio} \
 %{requires_block_curl} \
 %{requires_block_dmg} \
 %{requires_block_gluster} \
@@ -310,11 +312,11 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
 %endif
 
 # To prevent rpmdev-bumpspec breakage
-%global baserelease 3
+%global baserelease 6
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 7.1.0
+Version: 7.2.0
 Release: %{baserelease}%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
@@ -336,7 +338,9 @@ Source36: README.tests
 # Fix SGX assert
 Patch: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch
 Patch: 0001-tests-Disable-pci_virtio_vga-for-ppc64.patch
-Patch: 0010-Skip-iotests-entirely.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
 
 BuildRequires: meson >= %{meson_version}
 BuildRequires: zlib-devel
@@ -399,7 +403,8 @@ BuildRequires: pkgconfig(gbm)
 %endif
 BuildRequires: perl-Test-Harness
 BuildRequires: libslirp-devel
-BuildRequires: libbpf-devel
+BuildRequires: libbpf-devel >= 1.0.0
+BuildRequires: libblkio-devel
 
 
 # Fedora specific
@@ -606,6 +611,16 @@ Install this package if you want access to the avocado_qemu
 tests, or qemu-iotests.
 
 
+%package  block-blkio
+Summary: QEMU blkio block driver
+Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+%description block-blkio
+This package provides the additional blkio block driver for QEMU.
+
+Install this package if you want to access disks over vhost-user-blk, vdpa-blk,
+and other transports using the libblkio library.
+
+
 %package  block-curl
 Summary: QEMU CURL block driver
 Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
@@ -1409,6 +1424,7 @@ mkdir -p %{static_builddir}
   --disable-auth-pam               \\\
   --disable-avx2                   \\\
   --disable-avx512f                \\\
+  --disable-blkio                  \\\
   --disable-block-drv-whitelist-in-tools \\\
   --disable-bochs                  \\\
   --disable-bpf                    \\\
@@ -1442,6 +1458,7 @@ mkdir -p %{static_builddir}
   --disable-glusterfs              \\\
   --disable-gnutls                 \\\
   --disable-gtk                    \\\
+  --disable-gtk-clipboard          \\\
   --disable-guest-agent            \\\
   --disable-guest-agent-msi        \\\
   --disable-hax                    \\\
@@ -1497,6 +1514,7 @@ mkdir -p %{static_builddir}
   --disable-slirp-smbd             \\\
   --disable-smartcard              \\\
   --disable-snappy                 \\\
+  --disable-sndio                  \\\
   --disable-sparse                 \\\
   --disable-spice                  \\\
   --disable-spice-protocol         \\\
@@ -1588,6 +1606,7 @@ run_configure \
 %ifarch %{ix86} x86_64
   --enable-avx2 \
 %endif
+  --enable-blkio \
   --enable-bpf \
   --enable-cap-ng \
   --enable-capstone \
@@ -1642,7 +1661,7 @@ run_configure \
 %endif
   --enable-seccomp \
   --enable-selinux \
-  --enable-slirp=system \
+  --enable-slirp \
   --enable-slirp-smbd \
   --enable-snappy \
   --enable-system \
@@ -2202,6 +2221,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{testsdir}
 %{_libdir}/%{name}/accel-qtest-*.so
 
+%files block-blkio
+%{_libdir}/%{name}/block-blkio.so
 %files block-curl
 %{_libdir}/%{name}/block-curl.so
 %files block-iscsi
@@ -2741,6 +2762,28 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Tue Jan 31 2023 Stefan Hajnoczi <stefanha@redhat.com> - 7.2.0-6
+- Enable libblkio
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 11 2023 Richard W.M. Jones <rjones@redhat.com> - 2:7.2.0-4
+- Rebuild for xen-4.17.0, second attempt
+
+* Tue Jan 10 2023 Daniel P. Berrangé <berrange@redhat.com> - 7.2.0-3
+- Fix compat with linux > 6.1 headers
+- Re-enable iotests
+
+* Tue Jan 03 2023 Richard W.M. Jones <rjones@redhat.com> - 2:7.2.0-2
+- Rebuild for xen-4.17.0
+
+* Mon Dec 19 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.2.0-1
+- Rebase to qemu 7.2.0
+
+* Fri Nov 11 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.1.0-4
+- Update libbpf dependency
+
 * Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-3
 - Unconditionally enable capstone-devel
 
@@ -2936,125 +2979,3 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 * Mon Jan 11 2021 Paolo Bonzini <pbonzini@redhat.com> - 2:5.2.0-5
 - Use symlink for qemu-kvm.
 - Fix make check on bash 5.1.
-
-* Fri Dec 11 2020 Richard W.M. Jones <rjones@redhat.com> - 2:5.2.0-4
-- qemu-char-spice not qemu-chardev-spice.
-
-* Thu Dec 10 2020 Mohan Boddu <mboddu@bhujji.com> - 5.2.0-2
-- Fixing the ISA Dependencies
-
-* Wed Dec 09 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-1
-- Rebase to qemu-5.2.0 GA
-- Fix spice and GL UI module deps (bz 1904603)
-
-* Thu Dec 03 2020 Richard W.M. Jones <rjones@redhat.com> - 5.2.0-0.9.rc4
-- Enable qemu-kvm-core package on riscv64.
-
-* Thu Dec 03 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.8.rc4
-- Rebase to qemu-5.2.0-rc4
-
-* Tue Nov 24 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.7.rc2
-- Fix running 9p tests in copr
-
-* Thu Nov 19 2020 Paolo Bonzini <pbonzini@redhat.com> - 5.2.0-0.6.rc2
-- Remove --python=... to force use of system meson
-
-* Thu Nov 19 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.2.0-0.5.rc2
-- Re-enable systemtap tracing
-
-* Wed Nov 18 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.4.rc2
-- Rebase to qemu-5.2.0-rc2
-
-* Fri Nov 13 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.2.0-0.3.rc1
-- Disable user mode static builds in ELN
-
-* Wed Nov 11 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.2.rc1
-- Rebase to qemu-5.2.0-rc1
-
-* Sun Nov 08 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.1.rc0
-- Rebase to qemu-5.2.0-rc0
-
-* Thu Nov  5 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-7
-- Disable LTO again. Tests were not passing, we were ignoring failures.
-
-* Mon Oct 26 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-6
-- Re-enable LTO since tests now pass without asserts
-
-* Fri Sep  4 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-5
-- Drop conditions for ppc, ppc64, mips64 and s390 arches
-- Fix host qemu binary path for aarch64
-- Re-enable kernel BR for QEMU sanity check
-- Fix conditionals for enabling QEMU sanity check
-- Check whether emulator works before doing sanity check
-- Provide explicit kernel path for QEMU sanity check
-- Make QEMU sanity check a build blocker
-
-* Thu Sep  3 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-4
-- Add btrfs ioctls to linux-user (rhbz #1872918)
-
-* Tue Aug 18 2020 Tom Stellard <tstellar@redhat.com> - 5.1.0-3
-- Add BuildRequires: gcc
-- https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires
-
-* Mon Aug 17 2020 Cole Robinson <aintdiscole@gmail.com> - 5.1.0-2
-- Disable dtrace generation to fix use of modules (bz 1869339)
-
-* Tue Aug 11 2020 Cole Robinson <crobinso@redhat.com> - 5.1.0-1
-- Update to version 5.1.0
-
-* Fri Aug 07 2020 Cole Robinson <crobinso@redhat.com> - 5.1.0-0.3.rc3
-- Update to version 5.1.0-rc3
-
-* Thu Aug 06 2020 Merlin Mathesius <mmathesi@redhat.com> - 5.1.0-0.2.rc2
-- Use new %%{kernel_arches} macro to determine when a full kernel is available
-
-* Wed Aug 05 2020 Cole Robinson <aintdiscole@gmail.com> - 5.1.0-0.2.rc2
-- Pull in new modules by default, like we do for others
-
-* Tue Aug 04 2020 Cole Robinson <aintdiscole@gmail.com> - 5.1.0-0.1.rc2
-- Update to qemu 5.1.0 rc2
-
-* Fri Jul 31 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.0.0-6
-- Remove obsolete Fedora conditionals (PR#9)
-
-* Thu Jul 30 2020 Richard W.M. Jones <rjones@redhat.com> - 5.0.0-5
-- Disable LTO as it caused many strange assert failures.
-
-* Wed Jul 29 2020 Richard W.M. Jones <rjones@redhat.com> - 5.0.0-4
-- Backport Dan's upstream patch to fix insecure cert in test suite.
-
-* Mon Jul 27 2020 Kevin Fenzi <kevin@scrye.com> - 5.0.0-3
-- Rebuild for new xen
-
-* Wed May 13 2020 Cole Robinson <crobinso@redhat.com> - 5.0.0-2
-- Fix iouring hang (bz #1823751)
-
-* Wed May 06 2020 Cole Robinson <crobinso@redhat.com> - 5.0.0-1
-- Update to version 5.0.0
-
-* Thu Apr 16 2020 Cole Robinson <aintdiscole@gmail.com> - 5.0.0-0.3.rc3
-- Update to qemu 5.0.0 rc3
-
-* Thu Apr 09 2020 Cole Robinson <aintdiscole@gmail.com> - 5.0.0-0.3.rc2
-- Update to qemu 5.0.0 rc2
-
-* Wed Apr 08 2020 Adam Williamson <awilliam@redhat.com> - 2:5.0.0-0.2.rc0
-- Rebuild for new brltty
-
-* Wed Mar 25 2020 Cole Robinson <crobinso@redhat.com> - 2:5.0.0-0.1.rc0
-- Update to qemu-5.0.0-rc0
-
-* Tue Mar 17 2020 Fabiano Fidêncio <fidencio@redhat.com> - 2:4.2.0-7
-- Fix segfault with SR-IOV hot-{plug,unplug} (bz #1814017)
-
-* Tue Feb 25 2020 Cole Robinson <crobinso@redhat.com> - 2:4.2.0-6
-- Rebuild for libiscsi soname bump
-
-* Sat Feb 15 2020 Cole Robinson <crobinso@redhat.com> - 2:4.2.0-5
-- Fix ppc shutdown issue (bz #1784961)
-
-* Tue Jan 28 2020 Cole Robinson <crobinso@redhat.com> - 2:4.2.0-4
-- virtio-fs support
-
-* Sat Jan 25 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.0-3
-- Add miscellaneous fixes for RISC-V (RHBZ#1794902).

sources

@@ -1 +1 @@
-SHA512 (qemu-7.1.0.tar.xz) = c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
+SHA512 (qemu-7.2.0.tar.xz) = f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13