CVS commit: pkgsrc/emulators/qemu

["Emile iMil Heitor" <imil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   imil
Date:           Tue Feb 20 14:16:58 UTC 2024

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo options.mk
Added Files:
        pkgsrc/emulators/qemu/patches: patch-target_i386_nvmm_nvmm-all.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.336 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.214 -r1.215 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/emulators/qemu/options.mk
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.335 pkgsrc/emulators/qemu/Makefile:1.336
--- pkgsrc/emulators/qemu/Makefile:1.335        Tue Jan 30 18:20:09 2024
+++ pkgsrc/emulators/qemu/Makefile      Tue Feb 20 14:16:57 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.335 2024/01/30 18:20:09 adam Exp $
+# $NetBSD: Makefile,v 1.336 2024/02/20 14:16:57 imil Exp $
 
 DISTNAME=      qemu-8.2.1
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.214 pkgsrc/emulators/qemu/distinfo:1.215
--- pkgsrc/emulators/qemu/distinfo:1.214        Tue Jan 30 18:20:09 2024
+++ pkgsrc/emulators/qemu/distinfo      Tue Feb 20 14:16:57 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.214 2024/01/30 18:20:09 adam Exp $
+$NetBSD: distinfo,v 1.215 2024/02/20 14:16:57 imil Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -21,5 +21,6 @@ SHA1 (patch-roms_u-boot-sam460ex_Makefil
 SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
 SHA1 (patch-target_i386_cpu.c) = 696b1137a7aac18f70933025cab5318b965aee66
 SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
+SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 28184cc3d1afc064d332bdd2530db16d8258222f
 SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a
 SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25

Index: pkgsrc/emulators/qemu/options.mk
diff -u pkgsrc/emulators/qemu/options.mk:1.21 pkgsrc/emulators/qemu/options.mk:1.22
--- pkgsrc/emulators/qemu/options.mk:1.21       Wed Aug 23 15:19:02 2023
+++ pkgsrc/emulators/qemu/options.mk    Tue Feb 20 14:16:57 2024
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.21 2023/08/23 15:19:02 adam Exp $
+# $NetBSD: options.mk,v 1.22 2024/02/20 14:16:57 imil Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qemu
-PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice
+PKG_SUPPORTED_OPTIONS= debug debug-info gtk3 iscsi jack sdl spice
 PKG_SUGGESTED_OPTIONS+=        iscsi sdl spice
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -37,6 +37,12 @@ CONFIGURE_ARGS+=     --enable-debug-info
 CONFIGURE_ARGS+=       --disable-debug-info
 .endif
 
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --enable-debug
+.else
+CONFIGURE_ARGS+=       --disable-debug
+.endif
+
 .if !empty(PKG_OPTIONS:Mgtk3)
 PLIST.gtk=             yes
 CONFIGURE_ARGS+=       --enable-gtk

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.6
--- /dev/null   Tue Feb 20 14:16:58 2024
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c     Tue Feb 20 14:16:58 2024
@@ -0,0 +1,22 @@
+$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) {