CVS commit: pkgsrc/emulators/qemu

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Dec  9 13:54:18 UTC 2024

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

Log Message:
emulators/qemu: Fix NVMM for UEFI (OVMF)

* From DragonFly BSD's Redmine's issue 3110 to fix memory error
  when UEFI boot.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.358 -r1.359 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.223 -r1.224 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    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.358 pkgsrc/emulators/qemu/Makefile:1.359
--- pkgsrc/emulators/qemu/Makefile:1.358        Thu Nov 21 19:04:06 2024
+++ pkgsrc/emulators/qemu/Makefile      Mon Dec  9 13:54:17 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.358 2024/11/21 19:04:06 adam Exp $
+# $NetBSD: Makefile,v 1.359 2024/12/09 13:54:17 ryoon Exp $
 
 DISTNAME=      qemu-9.1.2
+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.223 pkgsrc/emulators/qemu/distinfo:1.224
--- pkgsrc/emulators/qemu/distinfo:1.223        Thu Nov 21 19:04:06 2024
+++ pkgsrc/emulators/qemu/distinfo      Mon Dec  9 13:54:17 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.223 2024/11/21 19:04:06 adam Exp $
+$NetBSD: distinfo,v 1.224 2024/12/09 13:54:17 ryoon Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -22,6 +22,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) = 9c0b6158bd28b5a5a9da98bd211e19494857076d
+SHA1 (patch-target_i386_nvmm_nvmm-all.c) = a022698e0742f10e8cdf42ed1ed7dfb8e113fb91
 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.7 pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.8
--- pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c:1.7 Wed Jul 10 06:52:48 2024
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c     Mon Dec  9 13:54:17 2024
@@ -1,10 +1,23 @@
-$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.7 2024/07/10 06:52:48 triaxx Exp $
+$NetBSD: patch-target_i386_nvmm_nvmm-all.c,v 1.8 2024/12/09 13:54:17 ryoon Exp $
 
 Permit using older nvmm version.
 
---- target/i386/nvmm/nvmm-all.c.orig   2024-06-10 18:35:25.000000000 +0000
+--- target/i386/nvmm/nvmm-all.c.orig   2024-11-20 22:48:05.000000000 +0000
 +++ target/i386/nvmm/nvmm-all.c
-@@ -1169,14 +1169,10 @@ nvmm_accel_init(MachineState *ms)
+@@ -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;
+     }
+ 
+@@ -1170,14 +1174,10 @@ nvmm_accel_init(MachineState *ms)
          error_report("NVMM: Unable to fetch capability, error=%d", errno);
          return -err;
      }