Tue Feb 20 14:16:58 2024 UTC (107d)
Updated emulators/qemu to 8.2.1nb1

* Added --enable-debug option
* Enabled backward compatibility
  * Test kernel against userland and not against kernel
  * Remove state_size test and handle backward compatibility in libnvmm


(imil)
diff -r1.335 -r1.336 pkgsrc/emulators/qemu/Makefile
diff -r1.214 -r1.215 pkgsrc/emulators/qemu/distinfo
diff -r1.21 -r1.22 pkgsrc/emulators/qemu/options.mk
diff -r0 -r1.6 pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c
cvs diff -r1.335 -r1.336 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2024/01/30 18:20:09 1.335
+++ pkgsrc/emulators/qemu/Makefile 2024/02/20 14:16:57 1.336
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.335 2024/01/30 18:20:09 adam Exp $ 1# $NetBSD: Makefile,v 1.336 2024/02/20 14:16:57 imil Exp $
2 2
3DISTNAME= qemu-8.2.1 3DISTNAME= qemu-8.2.1
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.qemu.org/ 10HOMEPAGE= https://www.qemu.org/
10COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
12 13
13TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson 14TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson
14TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 15TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
15TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 16TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
16TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme 17TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme
cvs diff -r1.214 -r1.215 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2024/01/30 18:20:09 1.214
+++ pkgsrc/emulators/qemu/distinfo 2024/02/20 14:16:57 1.215
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.214 2024/01/30 18:20:09 adam Exp $ 1$NetBSD: distinfo,v 1.215 2024/02/20 14:16:57 imil Exp $
2 2
3BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321 3BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
4SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43 4SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
5Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes 5Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
6BLAKE2s (qemu-8.2.1.tar.xz) = cad2a7f6ed475148e73468b957ac6581b788e363d8561930bc4d9583273f8b41 6BLAKE2s (qemu-8.2.1.tar.xz) = cad2a7f6ed475148e73468b957ac6581b788e363d8561930bc4d9583273f8b41
7SHA512 (qemu-8.2.1.tar.xz) = e72d3e13339c03e8d371ca060ac700c45af2ca37523cddb6b02dcaf8430d75c8cef194cf496df9816440b281f368457def1126677db757928805d93ceca2f9af 7SHA512 (qemu-8.2.1.tar.xz) = e72d3e13339c03e8d371ca060ac700c45af2ca37523cddb6b02dcaf8430d75c8cef194cf496df9816440b281f368457def1126677db757928805d93ceca2f9af
8Size (qemu-8.2.1.tar.xz) = 129848448 bytes 8Size (qemu-8.2.1.tar.xz) = 129848448 bytes
9SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f 9SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
10SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a 10SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
11SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853 11SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
12SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2 12SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2
13SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced 13SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
14SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 14SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
15SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 15SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
16SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310 16SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
17SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33 17SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
18SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43 18SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
19SHA1 (patch-meson.build) = 0a3e28d8bf6bf6be311787d964ac4694c58c2fca 19SHA1 (patch-meson.build) = 0a3e28d8bf6bf6be311787d964ac4694c58c2fca
20SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2 20SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
21SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e 21SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
22SHA1 (patch-target_i386_cpu.c) = 696b1137a7aac18f70933025cab5318b965aee66 22SHA1 (patch-target_i386_cpu.c) = 696b1137a7aac18f70933025cab5318b965aee66
23SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c 23SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
 24SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 28184cc3d1afc064d332bdd2530db16d8258222f
24SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a 25SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a
25SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25 26SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25
cvs diff -r1.21 -r1.22 pkgsrc/emulators/qemu/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/options.mk 2023/08/23 15:19:02 1.21
+++ pkgsrc/emulators/qemu/options.mk 2024/02/20 14:16:57 1.22
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.21 2023/08/23 15:19:02 adam Exp $ 1# $NetBSD: options.mk,v 1.22 2024/02/20 14:16:57 imil Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qemu 3PKG_OPTIONS_VAR= PKG_OPTIONS.qemu
4PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice 4PKG_SUPPORTED_OPTIONS= debug debug-info gtk3 iscsi jack sdl spice
5PKG_SUGGESTED_OPTIONS+= iscsi sdl spice 5PKG_SUGGESTED_OPTIONS+= iscsi sdl spice
6 6
7.include "../../mk/bsd.fast.prefs.mk" 7.include "../../mk/bsd.fast.prefs.mk"
8 8
9.if ${OPSYS} == "Linux" 9.if ${OPSYS} == "Linux"
10PKG_SUPPORTED_OPTIONS+= virtfs-proxy-helper 10PKG_SUPPORTED_OPTIONS+= virtfs-proxy-helper
11.endif 11.endif
12 12
13.if ${OPSYS} != "Darwin" 13.if ${OPSYS} != "Darwin"
14# NetBSD<9.0 does not have EGL support in native X11, 14# NetBSD<9.0 does not have EGL support in native X11,
15# so the QEMU OpenGL display driver cannot build. 15# so the QEMU OpenGL display driver cannot build.
16. include "../../graphics/MesaLib/features.mk" 16. include "../../graphics/MesaLib/features.mk"
17. if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss]) 17. if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
@@ -27,26 +27,32 @@ PLIST_VARS+= gtk keymap virtfs-proxy-he @@ -27,26 +27,32 @@ PLIST_VARS+= gtk keymap virtfs-proxy-he
27.if !empty(PKG_OPTIONS:Mjack) 27.if !empty(PKG_OPTIONS:Mjack)
28CONFIGURE_ARGS+= --enable-jack 28CONFIGURE_ARGS+= --enable-jack
29.include "../../audio/jack/buildlink3.mk" 29.include "../../audio/jack/buildlink3.mk"
30.else 30.else
31CONFIGURE_ARGS+= --disable-jack 31CONFIGURE_ARGS+= --disable-jack
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mdebug-info) 34.if !empty(PKG_OPTIONS:Mdebug-info)
35CONFIGURE_ARGS+= --enable-debug-info 35CONFIGURE_ARGS+= --enable-debug-info
36.else 36.else
37CONFIGURE_ARGS+= --disable-debug-info 37CONFIGURE_ARGS+= --disable-debug-info
38.endif 38.endif
39 39
 40.if !empty(PKG_OPTIONS:Mdebug)
 41CONFIGURE_ARGS+= --enable-debug
 42.else
 43CONFIGURE_ARGS+= --disable-debug
 44.endif
 45
40.if !empty(PKG_OPTIONS:Mgtk3) 46.if !empty(PKG_OPTIONS:Mgtk3)
41PLIST.gtk= yes 47PLIST.gtk= yes
42CONFIGURE_ARGS+= --enable-gtk 48CONFIGURE_ARGS+= --enable-gtk
43.include "../../x11/gtk3/buildlink3.mk" 49.include "../../x11/gtk3/buildlink3.mk"
44.else 50.else
45CONFIGURE_ARGS+= --disable-gtk 51CONFIGURE_ARGS+= --disable-gtk
46.endif 52.endif
47 53
48.if !empty(PKG_OPTIONS:Mopengl) 54.if !empty(PKG_OPTIONS:Mopengl)
49CONFIGURE_ARGS+= --enable-opengl 55CONFIGURE_ARGS+= --enable-opengl
50.include "../../graphics/MesaLib/buildlink3.mk" 56.include "../../graphics/MesaLib/buildlink3.mk"
51.include "../../graphics/libepoxy/buildlink3.mk" 57.include "../../graphics/libepoxy/buildlink3.mk"
52.else 58.else
File Added: pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c
$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.6 2024/02/20 14:16:58 imil Exp $

Permit using older nvmm version.

--- target/i386/nvmm/nvmm-all.c.orig	2024-01-29 19:13:22.000000000 +0000
+++ target/i386/nvmm/nvmm-all.c
@@ -1171,14 +1171,10 @@ nvmm_accel_init(MachineState *ms)
         error_report("NVMM: Unable to fetch capability, error=%d", errno);
         return -err;
     }
-    if (qemu_mach.cap.version < NVMM_KERN_VERSION) {
+    if (qemu_mach.cap.version > NVMM_USER_VERSION) {
         error_report("NVMM: Unsupported version %u", qemu_mach.cap.version);
         return -EPROGMISMATCH;
     }
-    if (qemu_mach.cap.state_size != sizeof(struct nvmm_x64_state)) {
-        error_report("NVMM: Wrong state size %u", qemu_mach.cap.state_size);
-        return -EPROGMISMATCH;
-    }

     ret = nvmm_machine_create(&qemu_mach.mach);
     if (ret == -1) {