CVS commit: pkgsrc/emulators/qemu

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Aug 27 10:38:32 UTC 2025

Modified Files:
        pkgsrc/emulators/qemu: distinfo
        pkgsrc/emulators/qemu/patches: patch-target_i386_nvmm_nvmm-all.c
Removed Files:
        pkgsrc/emulators/qemu/patches: patch-target_i386_meson.build

Log Message:
emulators/qemu: Fix build for NetBSD/nvmm

* My Windows 10 VM still works.
* And Remove meson.build from distinfo.


To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/emulators/qemu/patches/patch-target_i386_meson.build
cvs rdiff -u -r1.10 -r1.11 \
    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/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.237 pkgsrc/emulators/qemu/distinfo:1.238
--- pkgsrc/emulators/qemu/distinfo:1.237        Wed Aug 27 06:27:03 2025
+++ pkgsrc/emulators/qemu/distinfo      Wed Aug 27 10:38:31 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.237 2025/08/27 06:27:03 adam Exp $
+$NetBSD: distinfo,v 1.238 2025/08/27 10:38:31 ryoon Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -27,6 +27,6 @@ SHA1 (patch-qemu-options.hx) = 6cf811ae4
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = 11663f670c6ca1b9e523b0d16843d87a6061b9a2
 SHA1 (patch-target_i386_cpu.c) = 46a37ffc8ece4db52e8239b32dde37403ad568bb
-SHA1 (patch-target_i386_nvmm_nvmm-all.c) = a25d957fd9ff7c35b8370604bff379c494220bd3
+SHA1 (patch-target_i386_nvmm_nvmm-all.c) = dc7081a6f2897a88014ca4d0cf0a6e9726689d7f
 SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a
 SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25

Index: pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.10 pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.11
--- pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.10        Mon Mar 10 13:46:26 2025
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c     Wed Aug 27 10:38:31 2025
@@ -1,13 +1,22 @@
-$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.10 2025/03/10 13:46:26 wiz Exp $
+$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.11 2025/08/27 10:38:31 ryoon Exp $
 
 emulators/qemu: Fix NVMM for UEFI (OVMF)
 
-* From DragonFly BSD's Redmine's issue 3110 to fix memory error
+* From DragonFly BSD's Redmine's issue 3310 to fix memory error
   when UEFI boot.
 
---- target/i386/nvmm/nvmm-all.c.orig   2024-11-20 22:48:05.000000000 +0000
+--- target/i386/nvmm/nvmm-all.c.orig   2025-08-26 18:32:38.000000000 +0000
 +++ target/i386/nvmm/nvmm-all.c
-@@ -1057,7 +1057,11 @@ nvmm_process_section(MemoryRegionSection
+@@ -984,7 +984,7 @@ nvmm_init_vcpu(CPUState *cpu)
+         }
+     }
+ 
+-    qcpu->vcpu_dirty = true;
++    cpu->vcpu_dirty = true;
+     cpu->accel = qcpu;
+ 
+     return 0;
+@@ -1059,7 +1059,11 @@ nvmm_process_section(MemoryRegionSection
      unsigned int delta;
      uintptr_t hva;