CVS commit: pkgsrc/emulators/qemu

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Aug 27 03:32:37 UTC 2021

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo
        pkgsrc/emulators/qemu/patches: patch-hw-mips-mipssim.c
            patch-hw_mips_meson.build patch-include_sysemu_nvmm.h
            patch-meson.build
Removed Files:
        pkgsrc/emulators/qemu/patches: patch-accel_Kconfig patch-configure
            patch-hw_alpha_alpha_sys.h patch-hw_alpha_dp264.c
            patch-hw_alpha_typhoon.c patch-include_sysemu_hw__accel.h
            patch-include_sysemu_kvm.h patch-meson__options.txt
            patch-nvmm-accel-ops.c patch-nvmm-accel-ops.h patch-nvmm-all.c
            patch-qemu-options.hx patch-roms_qemu-palcode_hwrpb.h
            patch-roms_qemu-palcode_init.c patch-roms_qemu-palcode_memcpy.c
            patch-roms_qemu-palcode_memset.c patch-roms_qemu-palcode_pal.S
            patch-roms_qemu-palcode_pci.c patch-roms_qemu-palcode_pci.h
            patch-roms_qemu-palcode_printf.c patch-roms_qemu-palcode_protos.h
            patch-roms_qemu-palcode_sys-clipper.h
            patch-roms_qemu-palcode_vgaio.c
            patch-roms_u-boot_tools_imx8m__image.sh
            patch-target_alpha_translate.c patch-target_i386_meson.build
            patch-target_i386_nvmm_meson.build
            patch-target_i386_nvmm_nvmm-accel-ops.c
            patch-target_i386_nvmm_nvmm-accel-ops.h
            patch-target_i386_nvmm_nvmm-all.c

Log Message:
qemu: Update to 6.1.0

* 6.1.0 release has NetBSD NVMM support.
* Fix NetBSD NVMM compile errors.
* Remove integrated Alpha patches.

Changelog:
Highlights include:

  * block: support for changing block node options after creation via
    'blockdev-reopen' QMP command
  * Crypto: more performant backend recommendations and improved documentation
  * I2C: emulation support for I2C muxes (pca9546, pca9548) and PMBus
  * TCG Plugins: now enabled by default, with new execlog and cache modelling
    plugins.
  * ARM: new board support for Aspeed (rainier-bmc, quanta-q7l1), npcm7xx
    (quanta-gbs-bmc), and Cortex-M3 (stm32vldiscovery) based machines
  * ARM: Aspeed support of Hash and Crypto Engine
  * ARM: emulation support for SVE2 (including bfloat16), integer matrix
    multiply accumulate operations, TLB invalidate in Outer Shareable domain,
    TLB range invalidate, and more.
  * PowerPC: pseries: support for detecting hotplug failures in newer guests
  * PowerPC: pseries: increased maximum CPU count
  * PowerPC: pseries: emulation support for some POWER10 prefixed instructions
  * PowerPC: new board support for Genesi/bPlan Pegasos II (pegasos2)
  * RISC-V: updates to OpenTitan platform support, including OpenTitan timer
  * RISC-V: support for virtio-vga
  * RISC-V: documentation improvements and general code cleanups/fixes
  * s390: emulation support for the vector-enhancements facility
  * s390: support for gen16 CPU models
  * x86: new Intel CPU model versions with support for XSAVES instruction
  * x86: added ACPI based PCI hotplug support for Q35 machine (now the default)
  * x86: improvements to emulation of AMD virtualization extensions
  * and lots more...


To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.182 -r1.183 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/qemu/patches/patch-accel_Kconfig \
    pkgsrc/emulators/qemu/patches/patch-hw_alpha_alpha_sys.h \
    pkgsrc/emulators/qemu/patches/patch-hw_alpha_dp264.c \
    pkgsrc/emulators/qemu/patches/patch-hw_alpha_typhoon.c \
    pkgsrc/emulators/qemu/patches/patch-nvmm-accel-ops.c \
    pkgsrc/emulators/qemu/patches/patch-nvmm-accel-ops.h \
    pkgsrc/emulators/qemu/patches/patch-nvmm-all.c \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_hwrpb.h \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_init.c \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_memcpy.c \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_memset.c \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_pci.c \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_pci.h \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_printf.c \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_protos.h \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_sys-clipper.h \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_vgaio.c \
    pkgsrc/emulators/qemu/patches/patch-roms_u-boot_tools_imx8m__image.sh \
    pkgsrc/emulators/qemu/patches/patch-target_alpha_translate.c \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_meson.build \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-accel-ops.c \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-accel-ops.h
cvs rdiff -u -r1.32 -r0 pkgsrc/emulators/qemu/patches/patch-configure
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/emulators/qemu/patches/patch-include_sysemu_hw__accel.h
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/emulators/qemu/patches/patch-include_sysemu_kvm.h \
    pkgsrc/emulators/qemu/patches/patch-meson__options.txt \
    pkgsrc/emulators/qemu/patches/patch-roms_qemu-palcode_pal.S \
    pkgsrc/emulators/qemu/patches/patch-target_i386_meson.build \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm_nvmm-all.c
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/emulators/qemu/patches/patch-include_sysemu_nvmm.h
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/qemu/patches/patch-meson.build
cvs rdiff -u -r1.5 -r0 pkgsrc/emulators/qemu/patches/patch-qemu-options.hx

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.282 pkgsrc/emulators/qemu/Makefile:1.283
--- pkgsrc/emulators/qemu/Makefile:1.282        Tue Jun 22 04:09:06 2021
+++ pkgsrc/emulators/qemu/Makefile      Fri Aug 27 03:32:37 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.282 2021/06/22 04:09:06 thorpej Exp $
+# $NetBSD: Makefile,v 1.283 2021/08/27 03:32:37 ryoon Exp $
 
-DISTNAME=      qemu-6.0.0
-PKGREVISION=   2
+DISTNAME=      qemu-6.1.0
+PKGNAME=       ${DISTNAME:S/-rc/rc/}
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -20,6 +20,7 @@ UNLIMIT_RESOURCES=    datasize
 HAS_CONFIGURE=         yes
 
 PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx-rtd-theme>=0.4.3:../../textproc/py-sphinx-rtd-theme
 
 SUBST_CLASSES+=                        sphinx-build
 SUBST_STAGE.sphinx-build=      pre-configure
@@ -27,7 +28,7 @@ SUBST_MESSAGE.sphinx-build=   Fix hardcode
 SUBST_FILES.sphinx-build+=     configure
 SUBST_FILES.sphinx-build+=     docs/meson.build
 SUBST_FILES.sphinx-build+=     roms/skiboot/doc/Makefile
-SUBST_FILES.sphinx-build+=     roms/u-boot/Documentation/Makefile
+SUBST_FILES.sphinx-build+=     roms/u-boot/doc/Makefile
 SUBST_SED.sphinx-build+=       -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
 
 .include "options.mk"
@@ -74,7 +75,6 @@ NOT_PAX_MPROTECT_SAFE+=       bin/qemu-system-
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64el
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mipsel
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-moxie
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-nios2
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-or1k
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-ppc

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.76 pkgsrc/emulators/qemu/PLIST:1.77
--- pkgsrc/emulators/qemu/PLIST:1.76    Wed May 26 00:59:44 2021
+++ pkgsrc/emulators/qemu/PLIST Fri Aug 27 03:32:37 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.76 2021/05/26 00:59:44 mcf Exp $
+@comment $NetBSD: PLIST,v 1.77 2021/08/27 03:32:37 ryoon Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -35,9 +35,7 @@ ${PLIST.riscv64}bin/qemu-riscv64
 ${PLIST.s390x}bin/qemu-s390x
 ${PLIST.sh4}bin/qemu-sh4
 ${PLIST.sh4eb}bin/qemu-sh4eb
-${PLIST.sparc}bin/qemu-sparc
 ${PLIST.sparc32plus}bin/qemu-sparc32plus
-${PLIST.sparc64}bin/qemu-sparc64
 bin/qemu-storage-daemon
 bin/qemu-system-aarch64
 bin/qemu-system-alpha
@@ -53,7 +51,6 @@ bin/qemu-system-mips
 bin/qemu-system-mips64
 bin/qemu-system-mips64el
 bin/qemu-system-mipsel
-bin/qemu-system-moxie
 bin/qemu-system-nios2
 bin/qemu-system-or1k
 bin/qemu-system-ppc
@@ -73,12 +70,12 @@ bin/qemu-system-xtensaeb
 ${PLIST.x86_64}bin/qemu-x86_64
 ${PLIST.xtensa}bin/qemu-xtensa
 ${PLIST.xtensaeb}bin/qemu-xtensaeb
+include/qemu-plugin.h
 ${PLIST.bridge-helper}libexec/qemu-bridge-helper
 ${PLIST.virtfs-proxy-helper}libexec/virtfs-proxy-helper
 man/man1/qemu-img.1
 man/man1/qemu-storage-daemon.1
 man/man1/qemu.1
-${PLIST.virtfs-proxy-helper}man/man1/virtfs-proxy-helper.1
 man/man7/qemu-block-drivers.7
 man/man7/qemu-cpu-models.7
 man/man7/qemu-ga-ref.7
@@ -87,26 +84,36 @@ man/man7/qemu-storage-daemon-qmp-ref.7
 man/man8/qemu-ga.8
 man/man8/qemu-nbd.8
 man/man8/qemu-pr-helper.8
+${PLIST.virtfs-proxy-helper}man/man1/virtfs-proxy-helper.1
 share/applications/qemu.desktop
 share/doc/qemu/.buildinfo
 share/doc/qemu/Makefile.multinode-NetBSD
+share/doc/qemu/about/build-platforms.html
+share/doc/qemu/about/deprecated.html
+share/doc/qemu/about/index.html
+share/doc/qemu/about/license.html
+share/doc/qemu/about/removed-features.html
 share/doc/qemu/devel/atomics.html
 share/doc/qemu/devel/bitops.html
 share/doc/qemu/devel/block-coroutine-wrapper.html
 share/doc/qemu/devel/build-system.html
+share/doc/qemu/devel/ci.html
 share/doc/qemu/devel/clocks.html
 share/doc/qemu/devel/code-of-conduct.html
 share/doc/qemu/devel/conflict-resolution.html
 share/doc/qemu/devel/control-flow-integrity.html
 share/doc/qemu/devel/decodetree.html
+share/doc/qemu/devel/ebpf_rss.html
 share/doc/qemu/devel/fuzzing.html
 share/doc/qemu/devel/index.html
 share/doc/qemu/devel/kconfig.html
 share/doc/qemu/devel/loads-stores.html
 share/doc/qemu/devel/memory.html
 share/doc/qemu/devel/migration.html
+share/doc/qemu/devel/modules.html
 share/doc/qemu/devel/multi-process.html
 share/doc/qemu/devel/multi-thread-tcg.html
+share/doc/qemu/devel/qapi-code-gen.html
 share/doc/qemu/devel/qgraph.html
 share/doc/qemu/devel/qom.html
 share/doc/qemu/devel/qtest.html
@@ -120,8 +127,12 @@ share/doc/qemu/devel/tcg-plugins.html
 share/doc/qemu/devel/tcg.html
 share/doc/qemu/devel/testing.html
 share/doc/qemu/devel/tracing.html
+share/doc/qemu/devel/ui.html
+share/doc/qemu/devel/vfio-migration.html
+share/doc/qemu/devel/writing-qmp-commands.html
 share/doc/qemu/genindex.html
 share/doc/qemu/index.html
+share/doc/qemu/interop/barrier.html
 share/doc/qemu/interop/bitmaps.html
 share/doc/qemu/interop/dbus-vmstate.html
 share/doc/qemu/interop/dbus.html
@@ -148,12 +159,20 @@ share/doc/qemu/specs/tpm.html
 share/doc/qemu/system/arm/aspeed.html
 share/doc/qemu/system/arm/collie.html
 share/doc/qemu/system/arm/cpu-features.html
+share/doc/qemu/system/arm/cubieboard.html
 share/doc/qemu/system/arm/digic.html
+share/doc/qemu/system/arm/emcraft-sf2.html
+share/doc/qemu/system/arm/emulation.html
 share/doc/qemu/system/arm/gumstix.html
+share/doc/qemu/system/arm/highbank.html
+share/doc/qemu/system/arm/imx25-pdk.html
 share/doc/qemu/system/arm/integratorcp.html
+share/doc/qemu/system/arm/kzm.html
+share/doc/qemu/system/arm/mainstone.html
 share/doc/qemu/system/arm/mps2.html
 share/doc/qemu/system/arm/musca.html
 share/doc/qemu/system/arm/musicpal.html
+share/doc/qemu/system/arm/nrf.html
 share/doc/qemu/system/arm/nseries.html
 share/doc/qemu/system/arm/nuvoton.html
 share/doc/qemu/system/arm/orangepi.html
@@ -163,15 +182,24 @@ share/doc/qemu/system/arm/realview.html
 share/doc/qemu/system/arm/sabrelite.html
 share/doc/qemu/system/arm/sbsa.html
 share/doc/qemu/system/arm/stellaris.html
+share/doc/qemu/system/arm/stm32.html
 share/doc/qemu/system/arm/sx1.html
 share/doc/qemu/system/arm/versatile.html
 share/doc/qemu/system/arm/vexpress.html
 share/doc/qemu/system/arm/virt.html
 share/doc/qemu/system/arm/xlnx-versal-virt.html
 share/doc/qemu/system/arm/xscale.html
-share/doc/qemu/system/build-platforms.html
+share/doc/qemu/system/authz.html
+share/doc/qemu/system/barrier.html
+share/doc/qemu/system/bootindex.html
 share/doc/qemu/system/cpu-hotplug.html
-share/doc/qemu/system/deprecated.html
+share/doc/qemu/system/device-emulation.html
+share/doc/qemu/system/devices/ivshmem.html
+share/doc/qemu/system/devices/net.html
+share/doc/qemu/system/devices/nvme.html
+share/doc/qemu/system/devices/usb.html
+share/doc/qemu/system/devices/vhost-user.html
+share/doc/qemu/system/devices/virtio-pmem.html
 share/doc/qemu/system/gdb.html
 share/doc/qemu/system/generic-loader.html
 share/doc/qemu/system/guest-loader.html
@@ -180,19 +208,16 @@ share/doc/qemu/system/i386/pc.html
 share/doc/qemu/system/images.html
 share/doc/qemu/system/index.html
 share/doc/qemu/system/invocation.html
-share/doc/qemu/system/ivshmem.html
 share/doc/qemu/system/keys.html
-share/doc/qemu/system/license.html
 share/doc/qemu/system/linuxboot.html
 share/doc/qemu/system/managed-startup.html
 share/doc/qemu/system/monitor.html
 share/doc/qemu/system/multi-process.html
 share/doc/qemu/system/mux-chardev.html
-share/doc/qemu/system/net.html
-share/doc/qemu/system/nvme.html
 share/doc/qemu/system/ppc/embedded.html
 share/doc/qemu/system/ppc/powermac.html
 share/doc/qemu/system/ppc/powernv.html
+share/doc/qemu/system/ppc/ppce500.html
 share/doc/qemu/system/ppc/prep.html
 share/doc/qemu/system/ppc/pseries.html
 share/doc/qemu/system/pr-manager.html
@@ -200,15 +225,17 @@ share/doc/qemu/system/qemu-block-drivers
 share/doc/qemu/system/qemu-cpu-models.html
 share/doc/qemu/system/qemu-manpage.html
 share/doc/qemu/system/quickstart.html
-share/doc/qemu/system/removed-features.html
 share/doc/qemu/system/riscv/microchip-icicle-kit.html
+share/doc/qemu/system/riscv/shakti-c.html
 share/doc/qemu/system/riscv/sifive_u.html
+share/doc/qemu/system/riscv/virt.html
 share/doc/qemu/system/s390x/3270.html
 share/doc/qemu/system/s390x/bootdevices.html
 share/doc/qemu/system/s390x/css.html
 share/doc/qemu/system/s390x/protvirt.html
 share/doc/qemu/system/s390x/vfio-ap.html
 share/doc/qemu/system/s390x/vfio-ccw.html
+share/doc/qemu/system/secrets.html
 share/doc/qemu/system/security.html
 share/doc/qemu/system/target-arm.html
 share/doc/qemu/system/target-avr.html
@@ -224,9 +251,7 @@ share/doc/qemu/system/target-sparc64.htm
 share/doc/qemu/system/target-xtensa.html
 share/doc/qemu/system/targets.html
 share/doc/qemu/system/tls.html
-share/doc/qemu/system/usb.html
 share/doc/qemu/system/virtio-net-failover.html
-share/doc/qemu/system/virtio-pmem.html
 share/doc/qemu/system/vnc-security.html
 share/doc/qemu/tools/index.html
 share/doc/qemu/tools/qemu-img.html
@@ -363,4 +388,3 @@ share/qemu/vgabios-stdvga.bin
 share/qemu/vgabios-virtio.bin
 share/qemu/vgabios-vmware.bin
 share/qemu/vgabios.bin
-@pkgdir var/run

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.182 pkgsrc/emulators/qemu/distinfo:1.183
--- pkgsrc/emulators/qemu/distinfo:1.182        Fri Jul  9 21:08:33 2021
+++ pkgsrc/emulators/qemu/distinfo      Fri Aug 27 03:32:37 2021
@@ -1,57 +1,27 @@
-$NetBSD: distinfo,v 1.182 2021/07/09 21:08:33 schmonz Exp $
+$NetBSD: distinfo,v 1.183 2021/08/27 03:32:37 ryoon Exp $
 
 SHA1 (palcode-clipper-qemu-5.2.0nb8) = ddbf1dffb7c2b2157e0bbe9fb7db7e57105130b1
 RMD160 (palcode-clipper-qemu-5.2.0nb8) = 3f9fe19a40f7ca72ecfe047d1449e55b63cba3ee
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
 Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
-SHA1 (qemu-6.0.0.tar.xz) = 131854b10d8c1614ae137c647aa31b756782ba2e
-RMD160 (qemu-6.0.0.tar.xz) = 0785bb4c32f1e9d23dcdfad562f18d232677a0c6
-SHA512 (qemu-6.0.0.tar.xz) = ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
-Size (qemu-6.0.0.tar.xz) = 107333232 bytes
-SHA1 (patch-accel_Kconfig) = d343285a8b548d2d6387b92576aed801265d2b24
+SHA1 (qemu-6.1.0.tar.xz) = aae5ef7761b5f2fc45f0076219f1249da86f94b5
+RMD160 (qemu-6.1.0.tar.xz) = 00f21e102c9ca70c154b770d0094fd48568bbdd5
+SHA512 (qemu-6.1.0.tar.xz) = 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c
+Size (qemu-6.1.0.tar.xz) = 111258808 bytes
 SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
-SHA1 (patch-configure) = d94427a90bbb8e4d1347503e5583b4966b039e37
 SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
-SHA1 (patch-hw-mips-mipssim.c) = f701897f2c2bee4a8c3fa5222903789f991a663a
-SHA1 (patch-hw_alpha_alpha_sys.h) = 5908698208937ff9eb0bf1c504e1144af3d1bcc4
-SHA1 (patch-hw_alpha_dp264.c) = 856304784f098863728ecac3d0a9287aa22190d7
-SHA1 (patch-hw_alpha_typhoon.c) = 1bed5cd6f355c4163585c5331356ebf38c5c3a16
+SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
 SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
 SHA1 (patch-hw_i386_acpi-build.c) = 7d23d09f71917cedca4226fd22baa45bcb0f7d33
-SHA1 (patch-hw_mips_meson.build) = ff4bec33d9d2f86a425e02928aa3b6963c22da68
+SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
-SHA1 (patch-include_sysemu_hw__accel.h) = a3cd022368a074e30dd3958932a006fa0fe011a6
-SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
-SHA1 (patch-include_sysemu_nvmm.h) = 7e49abdc7dc6a03f293780c63ac6c242d3914d15
-SHA1 (patch-meson.build) = ec26f7df6789ac6880ac2ac1f8b0f22ec9bb31f5
-SHA1 (patch-meson__options.txt) = 050adf1d5c07dc211fdafde7a21e2afe52db9169
+SHA1 (patch-include_sysemu_nvmm.h) = 2cf9ea36c77570136b0678fe3b1c126ca7fa04cd
+SHA1 (patch-meson.build) = 086400b3eebd0d5ce91af7779fa4f2a56d953542
 SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
-SHA1 (patch-nvmm-accel-ops.c) = 23ef13420a61d8bfa78f36ed7eae2e1523464617
-SHA1 (patch-nvmm-accel-ops.h) = 101b4f3f2a5775db4c93ffcf10b150e8545a3655
-SHA1 (patch-nvmm-all.c) = 93d33e285b616a20ad2af550bef31e88c55f6a22
-SHA1 (patch-qemu-options.hx) = 2e68ce28c9a678a666c3f23a0c1369d3568aa1eb
-SHA1 (patch-roms_qemu-palcode_hwrpb.h) = ae7b4c0680367af6f740d62a54dc86352128d76f
-SHA1 (patch-roms_qemu-palcode_init.c) = 7a0ebcd86f4106318791e7d90273fb55a424f1b8
-SHA1 (patch-roms_qemu-palcode_memcpy.c) = 7761774ae9092d0f494deaf302d663ba479a09cf
-SHA1 (patch-roms_qemu-palcode_memset.c) = 55fa4e52e03a351eb98475e7c4755e5edc409e6c
-SHA1 (patch-roms_qemu-palcode_pal.S) = fd13cf4ff7a4ba48a9cbb773d520eacf06615301
-SHA1 (patch-roms_qemu-palcode_pci.c) = 1d5b240fd6c940cbbe8518e4db529adba23d6fec
-SHA1 (patch-roms_qemu-palcode_pci.h) = 081c9d6d9955be24fd19455ae653339cdb133f02
-SHA1 (patch-roms_qemu-palcode_printf.c) = 7fb158f85bd1be9a939850d9d86175013f7a142b
-SHA1 (patch-roms_qemu-palcode_protos.h) = 60cf9db5544cb842207a893a78fa6bbe45af4c71
-SHA1 (patch-roms_qemu-palcode_sys-clipper.h) = 8983d7072b1c1e66bf0a18d2e49e503745692a46
-SHA1 (patch-roms_qemu-palcode_vgaio.c) = c8d7adc053cd6655f005527d16647611040c09d2
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
-SHA1 (patch-roms_u-boot_tools_imx8m__image.sh) = e4c452062f40569e33aa93eec4a65bd3af2e74fc
-SHA1 (patch-target_alpha_translate.c) = c4dc5053122a5a76ba2e7f0b27076f2b42247953
-SHA1 (patch-target_i386_meson.build) = 0b6430825e1f5715f6deea556043b7e5063cf10a
-SHA1 (patch-target_i386_nvmm_meson.build) = c773fbed28a87f53263ab5299a63ca77423d164f
-SHA1 (patch-target_i386_nvmm_nvmm-accel-ops.c) = fdc29ccd0fcd47b72e7802655fe92b08f7d22bb9
-SHA1 (patch-target_i386_nvmm_nvmm-accel-ops.h) = 74d6442e1ac1cdf187996f3dd82bb3efddc002ec
-SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 6370f1f6336546b24d9c3493cd0b27ca6843f35d
 SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76

Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.3 pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.4
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.3   Sat Feb 20 22:59:29 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c       Fri Aug 27 03:32:37 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-hw-mips-mipssim.c,v 1.3 2021/02/20 22:59:29 ryoon Exp $
+$NetBSD: patch-hw-mips-mipssim.c,v 1.4 2021/08/27 03:32:37 ryoon Exp $
 
---- hw/mips/mipssim.c.orig     2020-12-08 16:59:44.000000000 +0000
+--- hw/mips/mipssim.c.orig     2021-08-04 16:29:07.000000000 +0000
 +++ hw/mips/mipssim.c
-@@ -39,6 +39,7 @@
+@@ -39,12 +39,20 @@
  #include "hw/boards.h"
  #include "hw/mips/bios.h"
  #include "hw/loader.h"
@@ -10,7 +10,6 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.3 2
  #include "elf.h"
  #include "hw/sysbus.h"
  #include "hw/qdev-properties.h"
-@@ -46,6 +47,13 @@
  #include "qemu/error-report.h"
  #include "sysemu/qtest.h"
  #include "sysemu/reset.h"
@@ -24,7 +23,7 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.3 2
  
  static struct _loaderparams {
      int ram_size;
-@@ -136,7 +144,7 @@ static void mipsnet_init(int base, qemu_
+@@ -135,7 +143,7 @@ static void mipsnet_init(int base, qemu_
                                  sysbus_mmio_get_region(s, 0));
  }
  
@@ -33,7 +32,7 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.3 2
  mips_mipssim_init(MachineState *machine)
  {
      const char *kernel_filename = machine->kernel_filename;
-@@ -147,6 +155,7 @@ mips_mipssim_init(MachineState *machine)
+@@ -146,6 +154,7 @@ mips_mipssim_init(MachineState *machine)
      MemoryRegion *isa = g_new(MemoryRegion, 1);
      MemoryRegion *bios = g_new(MemoryRegion, 1);
      Clock *cpuclk;
@@ -41,7 +40,7 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.3 2
      MIPSCPU *cpu;
      CPUMIPSState *env;
      ResetData *reset_info;
-@@ -209,7 +218,7 @@ mips_mipssim_init(MachineState *machine)
+@@ -208,7 +217,7 @@ mips_mipssim_init(MachineState *machine)
      /* Register 64 KB of ISA IO space at 0x1fd00000. */
      memory_region_init_alias(isa, NULL, "isa_mmio",
                               get_system_io(), 0, 0x00010000);
@@ -50,7 +49,7 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.3 2
  
      /*
       * A single 16450 sits at offset 0x3f8. It is attached to
-@@ -230,6 +239,23 @@ mips_mipssim_init(MachineState *machine)
+@@ -229,6 +238,23 @@ mips_mipssim_init(MachineState *machine)
      if (nd_table[0].used)
          /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
          mipsnet_init(0x4200, env->irq[2], &nd_table[0]);

Index: pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.2 pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.3
--- pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.2 Mon May 24 14:22:08 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build     Fri Aug 27 03:32:37 2021
@@ -1,13 +1,13 @@
-$NetBSD: patch-hw_mips_meson.build,v 1.2 2021/05/24 14:22:08 ryoon Exp $
+$NetBSD: patch-hw_mips_meson.build,v 1.3 2021/08/27 03:32:37 ryoon Exp $
 
---- hw/mips/meson.build.orig   2021-04-29 17:18:58.000000000 +0000
+--- hw/mips/meson.build.orig   2021-08-04 16:29:07.000000000 +0000
 +++ hw/mips/meson.build
-@@ -5,7 +5,7 @@ mips_ss.add(when: 'CONFIG_FULOONG', if_t
- mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c', 'loongson3_virt.c'))
+@@ -7,7 +7,7 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_
+ 
+ if 'CONFIG_TCG' in config_all
  mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
- mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c'))
 -mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c'))
 +mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c', 'mipssim_virtio.c'))
+ mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
  mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt])
- mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'))
- 
+ endif

Index: pkgsrc/emulators/qemu/patches/patch-include_sysemu_nvmm.h
diff -u pkgsrc/emulators/qemu/patches/patch-include_sysemu_nvmm.h:1.4 pkgsrc/emulators/qemu/patches/patch-include_sysemu_nvmm.h:1.5
--- pkgsrc/emulators/qemu/patches/patch-include_sysemu_nvmm.h:1.4       Mon May 24 14:22:08 2021
+++ pkgsrc/emulators/qemu/patches/patch-include_sysemu_nvmm.h   Fri Aug 27 03:32:37 2021
@@ -1,31 +1,33 @@
-$NetBSD: patch-include_sysemu_nvmm.h,v 1.4 2021/05/24 14:22:08 ryoon Exp $
+$NetBSD: patch-include_sysemu_nvmm.h,v 1.5 2021/08/27 03:32:37 ryoon Exp $
 
---- include/sysemu/nvmm.h.orig 2021-05-06 04:47:40.186492405 +0000
+* Do not use CONFIG_NVMM directly to avoid pragma poison error.
+
+--- include/sysemu/nvmm.h.orig 2021-08-04 16:29:07.000000000 +0000
 +++ include/sysemu/nvmm.h
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 2018-2019 Maxime Villard, All rights reserved.
-+ *
-+ * NetBSD Virtual Machine Monitor (NVMM) accelerator support.
-+ *
-+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-+ * See the COPYING file in the top-level directory.
-+ */
-+
-+#ifndef QEMU_NVMM_H
-+#define QEMU_NVMM_H
-+
-+#include "config-host.h"
-+#include "qemu-common.h"
-+
-+#ifdef CONFIG_NVMM
-+
-+int nvmm_enabled(void);
-+
-+#else /* CONFIG_NVMM */
-+
-+#define nvmm_enabled() (0)
-+
-+#endif /* CONFIG_NVMM */
-+
-+#endif /* CONFIG_NVMM */
+@@ -13,14 +13,22 @@
+ #include "config-host.h"
+ #include "qemu-common.h"
+ 
+-#ifdef CONFIG_NVMM
++#ifdef NEED_CPU_H
++# ifdef CONFIG_NVMM
++#  define CONFIG_NVMM_IS_POSSIBLE
++# endif
++#else
++# define CONFIG_NVMM_IS_POSSIBLE
++#endif
++
++#ifdef CONFIG_NVMM_IS_POSSIBLE
+ 
+ int nvmm_enabled(void);
+ 
+-#else /* CONFIG_NVMM */
++#else /* CONFIG_NVMM_IS_POSSIBLE */
+ 
+ #define nvmm_enabled() (0)
+ 
+-#endif /* CONFIG_NVMM */
++#endif /* CONFIG_NVMM_IS_POSSIBLE */
+ 
+-#endif /* CONFIG_NVMM */
++#endif /* QEMU_NVMM_H */

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.7 pkgsrc/emulators/qemu/patches/patch-meson.build:1.8
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.7 Fri Jul  9 21:08:33 2021
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Fri Aug 27 03:32:37 2021
@@ -1,54 +1,22 @@
-$NetBSD: patch-meson.build,v 1.7 2021/07/09 21:08:33 schmonz Exp $
+$NetBSD: patch-meson.build,v 1.8 2021/08/27 03:32:37 ryoon Exp $
 
 * Add NetBSD support.
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
   to fix qemu-system-aarch64 link.
 * Detect curses (non-ncurses{,w} too)
 
---- meson.build.orig   2021-04-29 17:18:58.000000000 +0000
+--- meson.build.orig   2021-08-04 16:29:08.000000000 +0000
 +++ meson.build
-@@ -87,6 +87,7 @@ if cpu in ['x86', 'x86_64']
-   accelerator_targets += {
-     'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'],
-     'CONFIG_HVF': ['x86_64-softmmu'],
-+    'CONFIG_NVMM': ['i386-softmmu', 'x86_64-softmmu'],
-     'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'],
-   }
- endif
-@@ -170,6 +171,7 @@ version_res = []
- coref = []
- iokit = []
- emulator_link_args = []
-+nvmm =not_found
- hvf = not_found
- if targetos == 'windows'
-   socket = cc.find_library('ws2_32')
-@@ -227,6 +229,14 @@ if not get_option('hax').disabled()
-     accelerators += 'CONFIG_HAX'
+@@ -237,7 +237,7 @@ if not get_option('hax').disabled()
    endif
  endif
-+if targetos == 'netbsd'
-+  if cc.has_header('nvmm.h', required: get_option('nvmm'))
-+    nvmm = cc.find_library('nvmm', required: get_option('nvmm'))
-+  endif
-+  if nvmm.found()
-+    accelerators += 'CONFIG_NVMM'
-+  endif
-+endif
- 
- tcg_arch = config_host['ARCH']
- if not get_option('tcg').disabled()
-@@ -271,6 +281,9 @@ endif
- if 'CONFIG_HVF' not in accelerators and get_option('hvf').enabled()
-   error('HVF not available on this platform')
- endif
-+if 'CONFIG_NVMM' not in accelerators and get_option('nvmm').enabled()
-+  error('NVMM not available on this platform')
-+endif
- if 'CONFIG_WHPX' not in accelerators and get_option('whpx').enabled()
-   error('WHPX not available on this platform')
- endif
-@@ -607,7 +620,7 @@ if have_system and not get_option('curse
+ if targetos == 'netbsd'
+-  if cc.has_header_symbol('nvmm.h', 'nvmm_cpu_stop', required: get_option('nvmm'))
++  if cc.has_header_symbol('nvmm.h', 'nvmm_vcpu_stop', required: get_option('nvmm'))
+     nvmm = cc.find_library('nvmm', required: get_option('nvmm'))
+   endif
+   if nvmm.found()
+@@ -613,7 +613,7 @@ if have_system and not get_option('curse
        has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
      endif
      if has_curses_h
@@ -57,7 +25,7 @@ $NetBSD: patch-meson.build,v 1.7 2021/07
        foreach curses_libname : curses_libname_list
          libcurses = cc.find_library(curses_libname,
                                      required: false,
-@@ -625,7 +638,7 @@ if have_system and not get_option('curse
+@@ -631,7 +631,7 @@ if have_system and not get_option('curse
      endif
    endif
    if not get_option('iconv').disabled()
@@ -66,19 +34,3 @@ $NetBSD: patch-meson.build,v 1.7 2021/07
        # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
        # We need to use libiconv if available because mixing libiconv's headers with
        # the system libc does not work.
-@@ -2129,6 +2142,7 @@ common_all = common_ss.apply(config_all,
- common_all = static_library('common',
-                             build_by_default: false,
-                             sources: common_all.sources() + genh,
-+                            implicit_include_directories: false,
-                             dependencies: common_all.dependencies(),
-                             name_suffix: 'fa')
- 
-@@ -2576,6 +2590,7 @@ if have_system
-   summary_info += {'HAX support':       config_all.has_key('CONFIG_HAX')}
-   summary_info += {'HVF support':       config_all.has_key('CONFIG_HVF')}
-   summary_info += {'WHPX support':      config_all.has_key('CONFIG_WHPX')}
-+  summary_info += {'NVMM support':      config_all.has_key('CONFIG_NVMM')}
-   summary_info += {'Xen support':       config_host.has_key('CONFIG_XEN_BACKEND')}
-   if config_host.has_key('CONFIG_XEN_BACKEND')
-     summary_info += {'xen ctrl version':  config_host['CONFIG_XEN_CTRL_INTERFACE_VERSION']}