From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] qemu: update 8.0.4 Date: Sat, 16 Sep 2023 13:21:26 +0200 Message-ID: <20230916112126.55043-1-arne_f@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6539498909581931116==" List-Id: --===============6539498909581931116== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Arne Fitzenreiter --- ...er-add-more-compat-ioctl-definitions.patch | 69 ---------------- ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 78 ------------------- qemu/qemu.nm | 5 +- 3 files changed, 3 insertions(+), 149 deletions(-) delete mode 100644 qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl= -definitions.patch delete mode 100644 qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc= -2.36-sys-mou.patch diff --git a/qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-defini= tions.patch b/qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-defin= itions.patch deleted file mode 100644 index cd8121fed..000000000 --- a/qemu/patches/0001-Revert-linux-user-add-more-compat-ioctl-definitions.p= atch +++ /dev/null @@ -1,69 +0,0 @@ -From afa96c55f2c270405de8984e2466067bbb44c0e4 Mon Sep 17 00:00:00 2001 -From: =3D?UTF-8?q?Daniel=3D20P=3D2E=3D20Berrang=3DC3=3DA9?=3D -Date: Tue, 10 Jan 2023 12:49:00 -0500 -Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions" -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-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 - -Upstream-Status: Backport from v8.0 (master) - -Signed-off-by: Daniel P. Berrang=C3=A9 -Reviewed-by: Marc-Andr=C3=A9 Lureau -Link: https://lore.kernel.org/r/20230110174901.2580297-2-berrange(a)redhat.c= om -Signed-off-by: Joel Stanley ---- - linux-user/syscall.c | 25 ------------------------- - 1 file changed, 25 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index f95a6161e..510de8edc 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 - #endif diff --git a/qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-s= ys-mou.patch b/qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36= -sys-mou.patch deleted file mode 100644 index d754f21ad..000000000 --- a/qemu/patches/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.= patch +++ /dev/null @@ -1,78 +0,0 @@ -From e95c0a42940ca1cf763ca3374b36a9be030039d7 Mon Sep 17 00:00:00 2001 -From: =3D?UTF-8?q?Daniel=3D20P=3D2E=3D20Berrang=3DC3=3DA9?=3D -Date: Tue, 10 Jan 2023 12:49:01 -0500 -Subject: [PATCH] Revert "linux-user: fix compat with glibc >=3D 2.36 - sys/mount.h" -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-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 - -Upstream-Status: Backport from v8.0 (master) - -Signed-off-by: Daniel P. Berrang=C3=A9 -Reviewed-by: Marc-Andr=C3=A9 Lureau -Link: https://lore.kernel.org/r/20230110174901.2580297-3-berrange(a)redhat.c= om -Signed-off-by: Joel Stanley ---- - 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 510de8edc..13a67b84b 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -95,25 +95,7 @@ - #include - #include - #include -- --#ifdef HAVE_SYS_MOUNT_FSCONFIG --/* -- * glibc >=3D 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 --#endif - #include - #if defined(CONFIG_FIEMAP) - #include -diff --git a/meson.build b/meson.build -index e44432370..f37ba4114 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= ')) -=20 - # has_member - config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', diff --git a/qemu/qemu.nm b/qemu/qemu.nm index f0ca0b84f..7056fea84 100644 --- a/qemu/qemu.nm +++ b/qemu/qemu.nm @@ -4,8 +4,8 @@ ############################################################################= ### =20 name =3D qemu -version =3D 7.2.0 -release =3D 3 +version =3D 8.0.4 +release =3D 1 =20 groups =3D Applications/Virtualization url =3D https://www.qemu.org @@ -86,6 +86,7 @@ build --enable-vnc-jpeg \ --enable-seccomp \ --disable-xen \ + --disable-dbus-display \ --disable-sdl =20 install_cmds --=20 2.39.2 --===============6539498909581931116==--