CVS commit: pkgsrc/emulators/qemu

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Mar 10 13:46:26 UTC 2025

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

Log Message:
qemu: restore part of patch that was for a different issue

Add comment from the commit message.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.368 -r1.369 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.229 -r1.230 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.10 \
    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.368 pkgsrc/emulators/qemu/Makefile:1.369
--- pkgsrc/emulators/qemu/Makefile:1.368        Mon Mar 10 11:45:43 2025
+++ pkgsrc/emulators/qemu/Makefile      Mon Mar 10 13:46:25 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.368 2025/03/10 11:45:43 imil Exp $
+# $NetBSD: Makefile,v 1.369 2025/03/10 13:46:25 wiz Exp $
 
 DISTNAME=      qemu-9.2.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.229 pkgsrc/emulators/qemu/distinfo:1.230
--- pkgsrc/emulators/qemu/distinfo:1.229        Mon Mar 10 11:45:43 2025
+++ pkgsrc/emulators/qemu/distinfo      Mon Mar 10 13:46:25 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.229 2025/03/10 11:45:43 imil Exp $
+$NetBSD: distinfo,v 1.230 2025/03/10 13:46:25 wiz Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -20,5 +20,6 @@ SHA1 (patch-roms_u-boot-sam460ex_Makefil
 SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
 SHA1 (patch-target_i386_cpu.c) = f55795305c385784caee00c2a767a1cafa42ed91
 SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
+SHA1 (patch-target_i386_nvmm_nvmm-all.c) = a25d957fd9ff7c35b8370604bff379c494220bd3
 SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a
 SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25

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.10
--- /dev/null   Mon Mar 10 13:46:26 2025
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c     Mon Mar 10 13:46:26 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.10 2025/03/10 13:46:26 wiz Exp $
+
+emulators/qemu: Fix NVMM for UEFI (OVMF)
+
+* From DragonFly BSD's Redmine's issue 3110 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
+@@ -1057,7 +1057,11 @@ nvmm_process_section(MemoryRegionSection
+     unsigned int delta;
+     uintptr_t hva;
+ 
+-    if (!memory_region_is_ram(mr)) {
++    /*
++     * Don't exclude ROMD memory; for example, it's used to map UEFI firmware
++     * (if=pflash) and should be mapped for guest.
++     */
++    if (!memory_region_is_ram(mr) && !memory_region_is_romd(mr)) {
+         return;
+     }
+