qemu: update to 9.2.0.

srcpkgs/qemu-system-cris

@@ -1 +0,0 @@
-qemu

srcpkgs/qemu/patches/lfs64.patch

@@ -1,211 +0,0 @@
-Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
-anf macros behave same as their 64 suffixed counterparts. This also
-helps in compiling with latest musl C library, where these macros and
-functions are no more available under _GNU_SOURCE feature macro
-
-source: https://git.alpinelinux.org/aports/plain/community/qemu/lfs64.patch
---
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index bbba2a6..38fa09a 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -6812,13 +6812,13 @@ static int target_to_host_fcntl_cmd(int cmd)
-         ret = cmd;
-         break;
-     case TARGET_F_GETLK:
--        ret = F_GETLK64;
-+        ret = F_GETLK;
-         break;
-     case TARGET_F_SETLK:
--        ret = F_SETLK64;
-+        ret = F_SETLK;
-         break;
-     case TARGET_F_SETLKW:
--        ret = F_SETLKW64;
-+        ret = F_SETLKW;
-         break;
-     case TARGET_F_GETOWN:
-         ret = F_GETOWN;
-@@ -6834,13 +6834,13 @@ static int target_to_host_fcntl_cmd(int cmd)
-         break;
- #if TARGET_ABI_BITS == 32
-     case TARGET_F_GETLK64:
--        ret = F_GETLK64;
-+        ret = F_GETLK;
-         break;
-     case TARGET_F_SETLK64:
--        ret = F_SETLK64;
-+        ret = F_SETLK;
-         break;
-     case TARGET_F_SETLKW64:
--        ret = F_SETLKW64;
-+        ret = F_SETLKW;
-         break;
- #endif
-     case TARGET_F_SETLEASE:
-@@ -6894,8 +6894,8 @@ static int target_to_host_fcntl_cmd(int cmd)
-      * them to 5, 6 and 7 before making the syscall(). Since we make the
-      * syscall directly, adjust to what is supported by the kernel.
-      */
--    if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
--        ret -= F_GETLK64 - 5;
-+    if (ret >= F_GETLK && ret <= F_SETLKW) {
-+        ret -= F_GETLK - 5;
-     }
- #endif
- 
-@@ -6928,7 +6928,7 @@ static int host_to_target_flock(int type)
-     return type;
- }
- 
--static inline abi_long copy_from_user_flock(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock(struct flock *fl,
-                                             abi_ulong target_flock_addr)
- {
-     struct target_flock *target_fl;
-@@ -6953,7 +6953,7 @@ static inline abi_long copy_from_user_flock(struct flock64 *fl,
- }
- 
- static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
--                                          const struct flock64 *fl)
-+                                          const struct flock *fl)
- {
-     struct target_flock *target_fl;
-     short l_type;
-@@ -6972,8 +6972,8 @@ static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
-     return 0;
- }
- 
--typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
--typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
-+typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
-+typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
- 
- #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
- struct target_oabi_flock64 {
-@@ -6984,7 +6984,7 @@ struct target_oabi_flock64 {
-     abi_int   l_pid;
- } QEMU_PACKED;
- 
--static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_oabi_flock64(struct flock *fl,
-                                                    abi_ulong target_flock_addr)
- {
-     struct target_oabi_flock64 *target_fl;
-@@ -7009,7 +7009,7 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
- }
- 
- static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
--                                                 const struct flock64 *fl)
-+                                                 const struct flock *fl)
- {
-     struct target_oabi_flock64 *target_fl;
-     short l_type;
-@@ -7029,7 +7029,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
- }
- #endif
- 
--static inline abi_long copy_from_user_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock64(struct flock *fl,
-                                               abi_ulong target_flock_addr)
- {
-     struct target_flock64 *target_fl;
-@@ -7054,7 +7054,7 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
- }
- 
- static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
--                                            const struct flock64 *fl)
-+                                            const struct flock *fl)
- {
-     struct target_flock64 *target_fl;
-     short l_type;
-@@ -7075,7 +7075,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
- 
- static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
- {
--    struct flock64 fl64;
-+    struct flock fl64;
- #ifdef F_GETOWN_EX
-     struct f_owner_ex fox;
-     struct target_f_owner_ex *target_fox;
-@@ -7347,7 +7347,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
-         arg2 = arg3;
-         arg3 = arg4;
-     }
--    return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
-+    return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
- 
-@@ -7361,7 +7361,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
-         arg2 = arg3;
-         arg3 = arg4;
-     }
--    return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
-+    return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
- 
-@@ -8597,7 +8597,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
-     void *tdirp;
-     int hlen, hoff, toff;
-     int hreclen, treclen;
--    off64_t prev_diroff = 0;
-+    off_t prev_diroff = 0;
- 
-     hdirp = g_try_malloc(count);
-     if (!hdirp) {
-@@ -8650,7 +8650,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
-              * Return what we have, resetting the file pointer to the
-              * location of the first record not returned.
-              */
--            lseek64(dirfd, prev_diroff, SEEK_SET);
-+            lseek(dirfd, prev_diroff, SEEK_SET);
-             break;
-         }
- 
-@@ -8684,7 +8684,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
-     void *tdirp;
-     int hlen, hoff, toff;
-     int hreclen, treclen;
--    off64_t prev_diroff = 0;
-+    off_t prev_diroff = 0;
- 
-     hdirp = g_try_malloc(count);
-     if (!hdirp) {
-@@ -8726,7 +8726,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
-              * Return what we have, resetting the file pointer to the
-              * location of the first record not returned.
-              */
--            lseek64(dirfd, prev_diroff, SEEK_SET);
-+            lseek(dirfd, prev_diroff, SEEK_SET);
-             break;
-         }
- 
-@@ -11157,7 +11157,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
-                 return -TARGET_EFAULT;
-             }
-         }
--        ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+        ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
-         unlock_user(p, arg2, ret);
-         return ret;
-     case TARGET_NR_pwrite64:
-@@ -11174,7 +11174,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
-                 return -TARGET_EFAULT;
-             }
-         }
--        ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+        ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
-         unlock_user(p, arg2, 0);
-         return ret;
- #endif
-@@ -12034,7 +12034,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
-     case TARGET_NR_fcntl64:
-     {
-         int cmd;
--        struct flock64 fl;
-+        struct flock fl;
-         from_flock64_fn *copyfrom = copy_from_user_flock64;
-         to_flock64_fn *copyto = copy_to_user_flock64;
-

srcpkgs/qemu/template

@@ -1,7 +1,7 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user
 pkgname=qemu
-version=9.1.2
+version=9.2.0
 revision=1
 build_style=meta
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -10,7 +10,8 @@ configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
  -Dtpm=enabled -Dusb_redir=enabled -Dvhost_net=enabled -Dvirtfs=enabled -Dpng=enabled
  -Daudio_drv_list=alsa,sdl,jack,pa -Dopengl=enabled -Dpa=enabled -Dsdl=enabled
  -Dsmartcard=enabled -Dspice=enabled -Dvirglrenderer=enabled -Dgtk=enabled"
-hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme"
+hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme
+ python3-pycotap"
 makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
  snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
  libsasl-devel ncurses-devel libseccomp-devel nss-devel
@@ -19,13 +20,13 @@ makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-de
  libxkbcommon-devel libzstd-devel SDL2-devel SDL2_image-devel gtk+3-devel
  vte3-devel spice-devel pcsclite-devel virglrenderer-devel libepoxy-devel
  libdrm-devel MesaLib-devel libiscsi-devel libcacard-devel libnuma-devel
- jack-devel pulseaudio-devel"
+ jack-devel pulseaudio-devel libcbor-devel"
 short_desc="Open source processor emulator"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
 ignore_elf_dirs="/usr/share/qemu"
 
 build_options="gtk3 iscsi jack numa opengl pulseaudio sdl2 smartcard spice virgl"
@@ -51,7 +52,6 @@ _archs=(
  alpha
  arm
  avr
- cris
  hppa
  i386
  loongarch64
@@ -113,7 +113,7 @@ for _arch in "${_archs[@]}"; do
 		_extras="opensbi-riscv64-generic-fw_dynamic.bin"
 		;;
 	s390x)
-		_extras="s390-ccw.img s390-netboot.img"
+		_extras="s390-ccw.img"
 		;;
 	sparc)
 		_extras="openbios-sparc32"
@@ -136,6 +136,8 @@ subpackages+=" qemu-common"
 
 . /void-packages/common/build-style/configure.sh 2>/dev/null
 
+export PYTHONUNBUFFERED=1
+
 _sys_tmpl() {
 	_arch="$1"
 	_depends="$2"
@@ -152,6 +154,11 @@ _sys_tmpl() {
 	}
 }
 
+post_extract() {
+	# remove vendored wheels, these should come from (host)makedepends
+	rm -r python/wheels
+}
+
 post_install() {
 	# qemu-bridge-helper must be setuid for non privileged users.
 	chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
@@ -162,7 +169,10 @@ qemu-common_package() {
 	short_desc+=" - common files"
 	pkg_install() {
 		vmove usr/share
-		vmove usr/include
+		# TCG plugins are deprecated on 32bit, so there are no headers to move
+		if [ "$XBPS_TARGET_WORDSIZE" -eq 64 ]; then
+			vmove usr/include
+		fi
 		vmove usr/libexec
 	}
 }