PR#53: Rebase to stable release v7.2.7 - rpms/qemu

rpms / qemu

#53 Rebase to stable release v7.2.7

Merged 6 months ago by crobinso. Opened 6 months ago by crobinso.

rpms/ crobinso/qemu f38-7.2.7-stable into f38

Rebase to qemu 7.2.7

Cole Robinson • 6 months ago

b6ffc3d

Disable iotests like we do in f39+ and RHEL

Cole Robinson • 6 months ago

3a106c7

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

file removed

-67

		`@@ -1,67 +0,0 @@`
		`- From 5c1d2f920c14d6e8f4ac7abc62714eadaa60f228 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 3/7] 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 24b25759be..10af5e0d8e 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.37.3`
		`-`

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

file removed

-76

		`@@ -1,76 +0,0 @@`
		`- From b40cf0a490c28d5b79e05382d061983b92a7b2b3 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 4/7] 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 10af5e0d8e..d974c76b60 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 5c6b5a1c75..3172b01089 100644`
		`- --- a/meson.build`
		`- +++ b/meson.build`
		`- @@ -2032,8 +2032,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.37.3`
		`-`

qemu.spec

file modified

+8 -4

		`@@ -325,7 +325,7 @@`

		`Summary: QEMU is a FAST! processor emulator`
		`Name: qemu`
		`- Version: 7.2.6`
		`+ Version: 7.2.7`
		`Release: %{baserelease}%{?rcrel}%{?dist}`
		`Epoch: 2`
		`License: GPLv2 and BSD and MIT and CC-BY`
		`@@ -347,9 +347,6 @@`
		`# Fix SGX assert`
		`Patch: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch`
		`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 build with glib2 2.75.3`
		`# https://bugzilla.redhat.com/show_bug.cgi?id=2173639`
		`# https://gitlab.com/qemu-project/qemu/-/issues/1518`
		`@@ -2004,6 +2001,10 @@`


		`%check`
		`+ # Disable iotests. RHEL has done this forever, and these`
		`+ # tests have been flakey in the past`
		`+ export MTESTARGS="--no-suite block"`
		`+`
		`%if %{with check}`
		`%if !%{tools_only}`

		`@@ -2786,6 +2787,9 @@`


		`%changelog`
		`+ * Tue Nov 28 2023 Cole Robinson <crobinso@redhat.com> - 7.2.7-1`
		`+ - Rebase to qemu 7.2.7`
		`+`
		`* Tue Sep 26 2023 Cole Robinson <crobinso@redhat.com> - 7.2.6-1`
		`- Rebase to qemu 7.2.6`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (qemu-7.2.6.tar.xz) = 534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30`
		`+ SHA512 (qemu-7.2.7.tar.xz) = 44c0023a9f6177706be5e565297b0ff5fd62a0ea17b085fe478677ada33ab4c922968e4e8fca7aecb310b2b7809a08c075262cc640981a42bcee618e6ae4e592`

crobinso commented 6 months ago

disable iotests like we do elsewhere. currently failing in a fixable way due to a missing dep, but simpler and more consistent to disable IMO
rebase to 7.2.7 stable, drop a couple of merged patches