qemu: Update to 5.1.0

Changelog:
Highlights include:

    ARM: support for ARMv8.2 TTS2UXN architecture feature
    ARM: support for ARMv8.5 MemTag architecture feature
    ARM: new board support for sonorapass-bmc
    ARM: virt: support for memory hot-unplug
    ARM: support for nvdimm hotplug for ACPI guests
    AVR: new architecture support for AVR CPUs
    AVR: new board support for Arduino Duemilanove, Arduino Mega 2560, Arduino Mega, and Arduino UNO
    MIPS: support for Loongson 3A CPUs (R1 and R4)
    MIPS: performance improvements for FPU and MSA instruction emulation
    PowerPC: support for guest error recovery via FWNMI
    RISC-V: support for SiFive E34 and Ibex CPUs
    RISC-V: new board support for HiFive1 revB and OpenTitan
    RISC-V: Spike machine now supports more than 1 CPU
    s390: KVM support for protected virtualization (secure execution mode)
    x86: improvements to HVF acceleration support on macOS
    x86: reduced virtualization overhead for non-enlightened Windows guests via Windows ACPI Emulated Device Table
    block: support for 2MB logical/physical blocksizes for virtual storage devices
    crypto: support for passing secrets to QEMU via Linux keyring
    crypto: support for LUKS keyslot management via qemu-img
    NVMe: support for Persistent Memory Region from NVMe 1.4 spec
    qemu-img: additional features added for map/convert/measure commands, as well as support for zstd compression
    qemu-img: support for new 'bitmap' command for manipulating persistent bitmaps in qcow2 files
    virtio: TCG guests can now use vhost-user threads
    virtio: vhost-user now supports registering more than 8 RAM slots
    and lots more...

11 files changed, 157 insertions, 163 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index a54e76833f5..bab054d03c4 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.246 2020/06/28 13:39:52 nia Exp $
+# $NetBSD: Makefile,v 1.247 2020/08/12 18:31:27 ryoon Exp $
 
-DISTNAME=	qemu-5.0.0
-PKGREVISION=	5
+DISTNAME=	qemu-5.1.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index cab6707d586..3d61939550f 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.66 2020/04/30 17:16:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.67 2020/08/12 18:31:27 ryoon Exp $
 bin/elf2dmp
 ${PLIST.ivshmem}bin/ivshmem-client
 ${PLIST.ivshmem}bin/ivshmem-server
@@ -44,6 +44,7 @@ bin/qemu-storage-daemon
 bin/qemu-system-aarch64
 bin/qemu-system-alpha
 bin/qemu-system-arm
+bin/qemu-system-avr
 bin/qemu-system-cris
 bin/qemu-system-hppa
 bin/qemu-system-i386
@@ -91,6 +92,21 @@ man/man8/qemu-nbd.8
 share/applications/qemu.desktop
 share/doc/qemu/Makefile.multinode-NetBSD
 share/doc/qemu/index.html
+share/doc/qemu/interop/_static/alabaster.css
+share/doc/qemu/interop/_static/basic.css
+share/doc/qemu/interop/_static/custom.css
+share/doc/qemu/interop/_static/doctools.js
+share/doc/qemu/interop/_static/documentation_options.js
+share/doc/qemu/interop/_static/file.png
+share/doc/qemu/interop/_static/jquery-3.4.1.js
+share/doc/qemu/interop/_static/jquery.js
+share/doc/qemu/interop/_static/language_data.js
+share/doc/qemu/interop/_static/minus.png
+share/doc/qemu/interop/_static/plus.png
+share/doc/qemu/interop/_static/pygments.css
+share/doc/qemu/interop/_static/searchtools.js
+share/doc/qemu/interop/_static/underscore-1.3.1.js
+share/doc/qemu/interop/_static/underscore.js
 share/doc/qemu/interop/bitmaps.html
 share/doc/qemu/interop/dbus-vmstate.html
 share/doc/qemu/interop/dbus.html
@@ -99,15 +115,32 @@ share/doc/qemu/interop/index.html
 share/doc/qemu/interop/live-block-operations.html
 share/doc/qemu/interop/objects.inv
 share/doc/qemu/interop/pr-helper.html
+share/doc/qemu/interop/qemu-ga-ref.html
+share/doc/qemu/interop/qemu-ga-ref.txt
 share/doc/qemu/interop/qemu-ga.html
+share/doc/qemu/interop/qemu-qmp-ref.html
+share/doc/qemu/interop/qemu-qmp-ref.txt
 share/doc/qemu/interop/search.html
 share/doc/qemu/interop/searchindex.js
 share/doc/qemu/interop/vhost-user-gpu.html
 share/doc/qemu/interop/vhost-user.html
-share/doc/qemu/qemu-ga-ref.html
-share/doc/qemu/qemu-ga-ref.txt
-share/doc/qemu/qemu-qmp-ref.html
-share/doc/qemu/qemu-qmp-ref.txt
+share/doc/qemu/interop/vhost-vdpa.html
+share/doc/qemu/specs/_static/alabaster.css
+share/doc/qemu/specs/_static/basic.css
+share/doc/qemu/specs/_static/custom.css
+share/doc/qemu/specs/_static/doctools.js
+share/doc/qemu/specs/_static/documentation_options.js
+share/doc/qemu/specs/_static/file.png
+share/doc/qemu/specs/_static/jquery-3.4.1.js
+share/doc/qemu/specs/_static/jquery.js
+share/doc/qemu/specs/_static/language_data.js
+share/doc/qemu/specs/_static/minus.png
+share/doc/qemu/specs/_static/plus.png
+share/doc/qemu/specs/_static/pygments.css
+share/doc/qemu/specs/_static/searchtools.js
+share/doc/qemu/specs/_static/underscore-1.3.1.js
+share/doc/qemu/specs/_static/underscore.js
+share/doc/qemu/specs/acpi_hest_ghes.html
 share/doc/qemu/specs/acpi_hw_reduced_hotplug.html
 share/doc/qemu/specs/genindex.html
 share/doc/qemu/specs/index.html
@@ -118,8 +151,29 @@ share/doc/qemu/specs/search.html
 share/doc/qemu/specs/searchindex.js
 share/doc/qemu/specs/tpm.html
 share/doc/qemu/system/.buildinfo
+share/doc/qemu/system/_static/alabaster.css
+share/doc/qemu/system/_static/basic.css
+share/doc/qemu/system/_static/custom.css
+share/doc/qemu/system/_static/doctools.js
+share/doc/qemu/system/_static/documentation_options.js
+share/doc/qemu/system/_static/file.png
+share/doc/qemu/system/_static/jquery-3.4.1.js
+share/doc/qemu/system/_static/jquery.js
+share/doc/qemu/system/_static/language_data.js
+share/doc/qemu/system/_static/minus.png
+share/doc/qemu/system/_static/plus.png
+share/doc/qemu/system/_static/pygments.css
+share/doc/qemu/system/_static/searchtools.js
+share/doc/qemu/system/_static/underscore-1.3.1.js
+share/doc/qemu/system/_static/underscore.js
+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/digic.html
+share/doc/qemu/system/arm/gumstix.html
 share/doc/qemu/system/arm/integratorcp.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/nseries.html
 share/doc/qemu/system/arm/orangepi.html
@@ -128,6 +182,8 @@ share/doc/qemu/system/arm/realview.html
 share/doc/qemu/system/arm/stellaris.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/xscale.html
 share/doc/qemu/system/build-platforms.html
 share/doc/qemu/system/deprecated.html
@@ -149,15 +205,21 @@ share/doc/qemu/system/qemu-block-drivers.html
 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/s390x/3270.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/search.html
 share/doc/qemu/system/searchindex.js
 share/doc/qemu/system/security.html
 share/doc/qemu/system/target-arm.html
+share/doc/qemu/system/target-avr.html
 share/doc/qemu/system/target-i386.html
 share/doc/qemu/system/target-m68k.html
 share/doc/qemu/system/target-mips.html
 share/doc/qemu/system/target-ppc.html
+share/doc/qemu/system/target-rx.html
 share/doc/qemu/system/target-s390x.html
 share/doc/qemu/system/target-sparc.html
 share/doc/qemu/system/target-sparc64.html
@@ -167,6 +229,21 @@ share/doc/qemu/system/tls.html
 share/doc/qemu/system/usb.html
 share/doc/qemu/system/vnc-security.html
 share/doc/qemu/tools/.buildinfo
+share/doc/qemu/tools/_static/alabaster.css
+share/doc/qemu/tools/_static/basic.css
+share/doc/qemu/tools/_static/custom.css
+share/doc/qemu/tools/_static/doctools.js
+share/doc/qemu/tools/_static/documentation_options.js
+share/doc/qemu/tools/_static/file.png
+share/doc/qemu/tools/_static/jquery-3.4.1.js
+share/doc/qemu/tools/_static/jquery.js
+share/doc/qemu/tools/_static/language_data.js
+share/doc/qemu/tools/_static/minus.png
+share/doc/qemu/tools/_static/plus.png
+share/doc/qemu/tools/_static/pygments.css
+share/doc/qemu/tools/_static/searchtools.js
+share/doc/qemu/tools/_static/underscore-1.3.1.js
+share/doc/qemu/tools/_static/underscore.js
 share/doc/qemu/tools/genindex.html
 share/doc/qemu/tools/index.html
 share/doc/qemu/tools/objects.inv
@@ -178,6 +255,21 @@ share/doc/qemu/tools/searchindex.js
 share/doc/qemu/tools/virtfs-proxy-helper.html
 share/doc/qemu/tools/virtiofsd.html
 share/doc/qemu/user/.buildinfo
+share/doc/qemu/user/_static/alabaster.css
+share/doc/qemu/user/_static/basic.css
+share/doc/qemu/user/_static/custom.css
+share/doc/qemu/user/_static/doctools.js
+share/doc/qemu/user/_static/documentation_options.js
+share/doc/qemu/user/_static/file.png
+share/doc/qemu/user/_static/jquery-3.4.1.js
+share/doc/qemu/user/_static/jquery.js
+share/doc/qemu/user/_static/language_data.js
+share/doc/qemu/user/_static/minus.png
+share/doc/qemu/user/_static/plus.png
+share/doc/qemu/user/_static/pygments.css
+share/doc/qemu/user/_static/searchtools.js
+share/doc/qemu/user/_static/underscore-1.3.1.js
+share/doc/qemu/user/_static/underscore.js
 share/doc/qemu/user/genindex.html
 share/doc/qemu/user/index.html
 share/doc/qemu/user/main.html
@@ -194,13 +286,14 @@ share/icons/hicolor/48x48/apps/qemu.png
 share/icons/hicolor/512x512/apps/qemu.png
 share/icons/hicolor/64x64/apps/qemu.png
 share/icons/hicolor/scalable/apps/qemu.svg
-${PLIST.gtk}share/locale/bg/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/de_DE/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/fr_FR/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/hu/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/it/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo
+share/locale/bg/LC_MESSAGES/qemu.mo
+share/locale/de_DE/LC_MESSAGES/qemu.mo
+share/locale/fr_FR/LC_MESSAGES/qemu.mo
+share/locale/hu/LC_MESSAGES/qemu.mo
+share/locale/it/LC_MESSAGES/qemu.mo
+share/locale/sv/LC_MESSAGES/qemu.mo
+share/locale/tr/LC_MESSAGES/qemu.mo
+share/locale/zh_CN/LC_MESSAGES/qemu.mo
 share/qemu/QEMU,cgthree.bin
 share/qemu/QEMU,tcx.bin
 share/qemu/bamboo.dtb
@@ -306,3 +399,5 @@ share/qemu/vgabios-stdvga.bin
 share/qemu/vgabios-virtio.bin
 share/qemu/vgabios-vmware.bin
 share/qemu/vgabios.bin
+@pkgdir var/run
+@pkgdir include
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 52a7f0efb0d..11f3a20a29c 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,33 +1,31 @@
-$NetBSD: distinfo,v 1.161 2020/05/26 07:17:53 skrll Exp $
+$NetBSD: distinfo,v 1.162 2020/08/12 18:31:27 ryoon Exp $
 
-SHA1 (qemu-5.0.0.tar.xz) = 52d1c0e6025a212d4fde471e4d9b5913f2615f86
-RMD160 (qemu-5.0.0.tar.xz) = 58a704960cd712cf6c218216e8426a05948f6526
-SHA512 (qemu-5.0.0.tar.xz) = 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
-Size (qemu-5.0.0.tar.xz) = 62426192 bytes
-SHA1 (patch-Makefile) = 85d24d842ad2f7e1e2ec6f0e0e3268c21ef9bf0d
-SHA1 (patch-accel_stubs_Makefile.objs) = 92266dc400ac1e97013f7f19ee4b7a63b42c7fc0
+SHA1 (qemu-5.1.0.tar.xz) = 8c70ce2b65349e9b42bd20c9dec2c90f8e7b960a
+RMD160 (qemu-5.1.0.tar.xz) = f5e4a20c481d7e2bf822bf6bf41667b810c3cecd
+SHA512 (qemu-5.1.0.tar.xz) = e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3
+Size (qemu-5.1.0.tar.xz) = 62911540 bytes
+SHA1 (patch-Makefile) = c5630f4221bbc9f96e04335c907ceea555b7eb26
+SHA1 (patch-accel_stubs_Makefile.objs) = 5ecdbb83e446dcbba74e1f6cf2c098e7818c0809
 SHA1 (patch-accel_stubs_nvmm-stub.c) = d66d47eabb8bb6728e777da7589b43d491adbcc8
-SHA1 (patch-accel_tcg_user-exec.c) = ec5f3882c78763b4072daa41fd67e55da291c065
+SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
 SHA1 (patch-capstone_Makefile) = f59870031de8c4385a591362749ec82f57fd4c27
-SHA1 (patch-configure) = ada3ddba78c4eacf2591e47d27d26bf3886e8d73
+SHA1 (patch-configure) = 2f5689b83b58066865598a83d53be2de6b42e303
 SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
 SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
-SHA1 (patch-cpus.c) = a319b7533daf3036c44411c4b26270b1fbb96009
 SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
-SHA1 (patch-hw_tpm_tpm__ioctl.h) = a350c1708e1f9d85e07c4c354068703a45174baf
 SHA1 (patch-hw_usb_dev-mtp.c) = 0f9034fb3904e5d5e3b98d24b94e054181687d95
-SHA1 (patch-include_sysemu_hw__accel.h) = e5f581fa0539e55a6a1d559b94e94d47aedb88d7
+SHA1 (patch-include_sysemu_hw__accel.h) = 852bc031a1e065f614c5c913351f3e13183e00b7
 SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
 SHA1 (patch-include_sysemu_nvmm.h) = 3bd3da9b42ace0f806fabeb580f90ae19c273869
 SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
 SHA1 (patch-qemu-options.hx) = e2f264117f703aa4ccf56219f370c3b1303e8b07
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = e43111db0c56625bc8df5e3688c242c341f3fa6a
 SHA1 (patch-roms_u-boot_tools_imx8m__image.sh) = e4c452062f40569e33aa93eec4a65bd3af2e74fc
+SHA1 (patch-softmmu_cpus.c) = 489b6ef1a37bb617d50b903dfdd6fb41a302508d
 SHA1 (patch-target_i386_Makefile.objs) = be8ab2e72521ccd0a71db6b37feb9957b27ac970
 SHA1 (patch-target_i386_helper.c) = 54363fe53688ea4030665b3bbb3ee7aba7ba5348
 SHA1 (patch-target_i386_kvm-stub.c) = 4cd2b7a8d8d8a317829f982b5acff7fdf2479d9f
 SHA1 (patch-target_i386_nvmm-all.c) = 091c56c88c2366abef907ca99e5bfa9933a2b6ab
-SHA1 (patch-util_drm.c) = b30a46d623d9431c5af2f3cd101adb89be3f0c2b
diff --git a/emulators/qemu/patches/patch-Makefile b/emulators/qemu/patches/patch-Makefile
index 50538502508..c89f8a5c6c6 100644
--- a/emulators/qemu/patches/patch-Makefile
+++ b/emulators/qemu/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile,v 1.2 2019/08/16 15:12:19 adam Exp $
+$NetBSD: patch-Makefile,v 1.3 2020/08/12 18:31:27 ryoon Exp $
 
---- Makefile.orig	2019-08-15 19:01:42.000000000 +0000
+--- Makefile.orig	2020-08-11 19:17:15.000000000 +0000
 +++ Makefile
-@@ -474,6 +474,7 @@ $(TARGET_DIRS_RULES):
- DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
+@@ -530,6 +530,7 @@ $(TARGET_DIRS_RULES):
+ DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib=""
  DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
- DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
+ DTC_CPPFLAGS=-I$(SRC_PATH)/dtc/libfdt
 +ARFLAGS=	-rcs
  
  .PHONY: dtc/all
- dtc/all: .git-submodule-status dtc/libfdt dtc/tests
+ dtc/all: .git-submodule-status dtc/libfdt
diff --git a/emulators/qemu/patches/patch-accel_stubs_Makefile.objs b/emulators/qemu/patches/patch-accel_stubs_Makefile.objs
index d4c8a783f55..a5e67bf4ac7 100644
--- a/emulators/qemu/patches/patch-accel_stubs_Makefile.objs
+++ b/emulators/qemu/patches/patch-accel_stubs_Makefile.objs
@@ -1,13 +1,14 @@
-$NetBSD: patch-accel_stubs_Makefile.objs,v 1.1 2020/02/06 16:46:17 kamil Exp $
+$NetBSD: patch-accel_stubs_Makefile.objs,v 1.2 2020/08/12 18:31:27 ryoon Exp $
 
 Add NVMM support.
 
---- accel/stubs/Makefile.objs.orig	2019-12-12 18:20:47.000000000 +0000
+--- accel/stubs/Makefile.objs.orig	2020-08-11 19:17:15.000000000 +0000
 +++ accel/stubs/Makefile.objs
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
  obj-$(call lnot,$(CONFIG_HAX))  += hax-stub.o
  obj-$(call lnot,$(CONFIG_HVF))  += hvf-stub.o
  obj-$(call lnot,$(CONFIG_WHPX)) += whpx-stub.o
 +obj-$(call lnot,$(CONFIG_NVMM)) += nvmm-stub.o
  obj-$(call lnot,$(CONFIG_KVM))  += kvm-stub.o
  obj-$(call lnot,$(CONFIG_TCG))  += tcg-stub.o
+ obj-$(call lnot,$(CONFIG_XEN))  += xen-stub.o
diff --git a/emulators/qemu/patches/patch-accel_tcg_user-exec.c b/emulators/qemu/patches/patch-accel_tcg_user-exec.c
deleted file mode 100644
index 6f7008784fe..00000000000
--- a/emulators/qemu/patches/patch-accel_tcg_user-exec.c
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: patch-accel_tcg_user-exec.c,v 1.2 2020/05/10 11:33:23 skrll Exp $
-
-Fix building on NetBSD/arm by extracting the FSR value from the
-correct siginfo_t field.
-
---- accel/tcg/user-exec.c.orig	2020-04-28 16:49:24.000000000 +0000
-+++ accel/tcg/user-exec.c
-@@ -492,6 +492,7 @@ int cpu_signal_handler(int host_signum, 
- 
- #if defined(__NetBSD__)
- #include <ucontext.h>
-+#include <sys/siginfo.h>
- #endif
- 
- int cpu_signal_handler(int host_signum, void *pinfo,
-@@ -500,6 +501,7 @@ int cpu_signal_handler(int host_signum, 
-     siginfo_t *info = pinfo;
- #if defined(__NetBSD__)
-     ucontext_t *uc = puc;
-+    siginfo_t *si = pinfo;
- #else
-     ucontext_t *uc = puc;
- #endif
-@@ -514,15 +516,47 @@ int cpu_signal_handler(int host_signum, 
-     pc = uc->uc_mcontext.arm_pc;
- #endif
- 
-+#if defined(__NetBSD__)
-+    /* siginfo_t::si_trap is the FSR value, in which bit 11 is WnR
-+     * (assuming a v6 or later processor; on v5 we will always report
-+     * this as a read).
-+     */
-+    is_write = extract32(si->si_trap, 11, 1);
-+#else
-     /* error_code is the FSR value, in which bit 11 is WnR (assuming a v6 or
-      * later processor; on v5 we will always report this as a read).
-      */
-     is_write = extract32(uc->uc_mcontext.error_code, 11, 1);
-+#endif
-     return handle_cpu_signal(pc, info, is_write, &uc->uc_sigmask);
- }
- 
- #elif defined(__aarch64__)
- 
-+#if defined(__NetBSD__)
-+
-+#include <ucontext.h>
-+#include <sys/siginfo.h>
-+
-+int cpu_signal_handler(int host_signum, void *pinfo, void *puc)
-+{
-+    ucontext_t *uc = puc;
-+    siginfo_t *si = pinfo;
-+    unsigned long pc;
-+    int is_write;
-+    uint32_t esr;
-+
-+    pc = uc->uc_mcontext.__gregs[_REG_PC];
-+    esr = si->si_trap;
-+
-+    /* siginfo_t::si_trap is the ESR value, for data aborts ESR.EC
-+     * is 0b10010x: then bit 6 is the WnR bit
-+     */
-+    is_write = extract32(esr, 27, 5) == 0x12 && extract32(esr, 6, 1) == 1;
-+    return handle_cpu_signal(pc, si, is_write, &uc->uc_sigmask);
-+}
-+
-+#else
- #ifndef ESR_MAGIC
- /* Pre-3.16 kernel headers don't have these, so provide fallback definitions */
- #define ESR_MAGIC 0x45535201
-@@ -585,6 +619,7 @@ int cpu_signal_handler(int host_signum, 
-     }
-     return handle_cpu_signal(pc, info, is_write, &uc->uc_sigmask);
- }
-+#endif
- 
- #elif defined(__s390__)
- 
diff --git a/emulators/qemu/patches/patch-hw_tpm_tpm__ioctl.h b/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h
index efcea16226e..fb4d6e94791 100644
--- a/emulators/qemu/patches/patch-hw_tpm_tpm__ioctl.h
+++ b/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-hw_tpm_tpm__ioctl.h,v 1.2 2019/08/16 15:12:19 adam Exp $
+$NetBSD: patch-backends_tpm_tpm__ioctl.h,v 1.1 2020/08/12 18:31:27 ryoon Exp $
 
 SunOS needs filio.h for _IO*() macros.
 
---- hw/tpm/tpm_ioctl.h.orig	2019-08-15 19:01:42.000000000 +0000
-+++ hw/tpm/tpm_ioctl.h
+--- backends/tpm/tpm_ioctl.h.orig	2019-08-15 19:01:42.000000000 +0000
++++ backends/tpm/tpm_ioctl.h
 @@ -9,6 +9,9 @@
  #ifndef TPM_IOCTL_H
  #define TPM_IOCTL_H
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index c4ae836e738..c674af324ee 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.28 2020/05/23 15:46:12 leot Exp $
+$NetBSD: patch-configure,v 1.29 2020/08/12 18:31:27 ryoon Exp $
 
 Add NVMM support.
 Fix jemalloc detection.
 
---- configure.orig	2020-04-28 16:49:25.000000000 +0000
+--- configure.orig	2020-08-11 19:17:15.000000000 +0000
 +++ configure
-@@ -241,6 +241,17 @@ supported_whpx_target() {
+@@ -246,6 +246,17 @@ supported_whpx_target() {
      return 1
  }
  
@@ -23,7 +23,7 @@ Fix jemalloc detection.
  supported_target() {
      case "$1" in
          *-softmmu)
-@@ -268,6 +279,7 @@ supported_target() {
+@@ -273,6 +284,7 @@ supported_target() {
      supported_hax_target "$1" && return 0
      supported_hvf_target "$1" && return 0
      supported_whpx_target "$1" && return 0
@@ -31,7 +31,7 @@ Fix jemalloc detection.
      print_error "TCG disabled, but hardware accelerator not available for '$target'"
      return 1
  }
-@@ -389,6 +401,7 @@ kvm="no"
+@@ -395,6 +407,7 @@ kvm="no"
  hax="no"
  hvf="no"
  whpx="no"
@@ -39,7 +39,7 @@ Fix jemalloc detection.
  rdma=""
  pvrdma=""
  gprof="no"
-@@ -837,6 +850,7 @@ DragonFly)
+@@ -847,6 +860,7 @@ DragonFly)
  NetBSD)
    bsd="yes"
    hax="yes"
@@ -47,7 +47,7 @@ Fix jemalloc detection.
    make="${MAKE-gmake}"
    audio_drv_list="oss try-sdl"
    audio_possible_drivers="oss sdl"
-@@ -1210,6 +1224,10 @@ for opt do
+@@ -1233,6 +1247,10 @@ for opt do
    ;;
    --enable-whpx) whpx="yes"
    ;;
@@ -58,7 +58,7 @@ Fix jemalloc detection.
    --disable-tcg-interpreter) tcg_interpreter="no"
    ;;
    --enable-tcg-interpreter) tcg_interpreter="yes"
-@@ -1832,6 +1850,7 @@ disabled with --disable-FEATURE, default
+@@ -1879,6 +1897,7 @@ disabled with --disable-FEATURE, default
    hax             HAX acceleration support
    hvf             Hypervisor.framework acceleration support
    whpx            Windows Hypervisor Platform acceleration support
@@ -66,7 +66,7 @@ Fix jemalloc detection.
    rdma            Enable RDMA-based migration
    pvrdma          Enable PVRDMA support
    vde             support for vde network
-@@ -2871,6 +2890,20 @@ if test "$whpx" != "no" ; then
+@@ -2966,6 +2985,20 @@ if test "$whpx" != "no" ; then
  fi
  
  ##########################################
@@ -87,8 +87,8 @@ Fix jemalloc detection.
  # Sparse probe
  if test "$sparse" != "no" ; then
    if has cgcc; then
-@@ -4586,8 +4619,11 @@ if test "$jemalloc" = "yes" ; then
- int main(void) { malloc(1); return 0; }
+@@ -4736,8 +4769,11 @@ int main(void) {
+ }
  EOF
  
 -  if compile_prog "" "-ljemalloc" ; then
@@ -101,7 +101,7 @@ Fix jemalloc detection.
    else
      feature_not_found "jemalloc" "install jemalloc devel"
    fi
-@@ -6651,6 +6687,7 @@ echo "KVM support       $kvm"
+@@ -6934,6 +6970,7 @@ echo "KVM support       $kvm"
  echo "HAX support       $hax"
  echo "HVF support       $hvf"
  echo "WHPX support      $whpx"
@@ -109,7 +109,7 @@ Fix jemalloc detection.
  echo "TCG support       $tcg"
  if test "$tcg" = "yes" ; then
      echo "TCG debug enabled $debug_tcg"
-@@ -8001,6 +8038,9 @@ fi
+@@ -8332,6 +8369,9 @@ fi
  if test "$target_aligned_only" = "yes" ; then
    echo "TARGET_ALIGNED_ONLY=y" >> $config_target_mak
  fi
diff --git a/emulators/qemu/patches/patch-include_sysemu_hw__accel.h b/emulators/qemu/patches/patch-include_sysemu_hw__accel.h
index 94d33e25676..f5d304cfd4a 100644
--- a/emulators/qemu/patches/patch-include_sysemu_hw__accel.h
+++ b/emulators/qemu/patches/patch-include_sysemu_hw__accel.h
@@ -1,18 +1,18 @@
-$NetBSD: patch-include_sysemu_hw__accel.h,v 1.1 2020/02/06 16:46:17 kamil Exp $
+$NetBSD: patch-include_sysemu_hw__accel.h,v 1.2 2020/08/12 18:31:27 ryoon Exp $
 
 Add NVMM support.
 
---- include/sysemu/hw_accel.h.orig	2019-12-12 18:20:48.000000000 +0000
+--- include/sysemu/hw_accel.h.orig	2020-08-11 19:17:15.000000000 +0000
 +++ include/sysemu/hw_accel.h
-@@ -15,6 +15,7 @@
- #include "sysemu/hax.h"
+@@ -16,6 +16,7 @@
  #include "sysemu/kvm.h"
+ #include "sysemu/hvf.h"
  #include "sysemu/whpx.h"
 +#include "sysemu/nvmm.h"
  
  static inline void cpu_synchronize_state(CPUState *cpu)
  {
-@@ -27,6 +28,9 @@ static inline void cpu_synchronize_state
+@@ -31,6 +32,9 @@ static inline void cpu_synchronize_state
      if (whpx_enabled()) {
          whpx_cpu_synchronize_state(cpu);
      }
@@ -22,7 +22,7 @@ Add NVMM support.
  }
  
  static inline void cpu_synchronize_post_reset(CPUState *cpu)
-@@ -40,6 +44,10 @@ static inline void cpu_synchronize_post_
+@@ -47,6 +51,10 @@ static inline void cpu_synchronize_post_
      if (whpx_enabled()) {
          whpx_cpu_synchronize_post_reset(cpu);
      }
@@ -33,7 +33,7 @@ Add NVMM support.
  }
  
  static inline void cpu_synchronize_post_init(CPUState *cpu)
-@@ -53,6 +61,9 @@ static inline void cpu_synchronize_post_
+@@ -63,6 +71,9 @@ static inline void cpu_synchronize_post_
      if (whpx_enabled()) {
          whpx_cpu_synchronize_post_init(cpu);
      }
@@ -43,7 +43,7 @@ Add NVMM support.
  }
  
  static inline void cpu_synchronize_pre_loadvm(CPUState *cpu)
-@@ -66,6 +77,9 @@ static inline void cpu_synchronize_pre_l
+@@ -79,6 +90,9 @@ static inline void cpu_synchronize_pre_l
      if (whpx_enabled()) {
          whpx_cpu_synchronize_pre_loadvm(cpu);
      }
diff --git a/emulators/qemu/patches/patch-cpus.c b/emulators/qemu/patches/patch-softmmu_cpus.c
index 3f5e3ebff0b..e479ccc9630 100644
--- a/emulators/qemu/patches/patch-cpus.c
+++ b/emulators/qemu/patches/patch-softmmu_cpus.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-cpus.c,v 1.1 2020/02/06 16:46:17 kamil Exp $
+$NetBSD: patch-softmmu_cpus.c,v 1.1 2020/08/12 18:31:27 ryoon Exp $
 
 Add NVMM support.
 
---- cpus.c.orig	2019-12-12 18:20:47.000000000 +0000
-+++ cpus.c
+--- softmmu/cpus.c.orig	2019-12-12 18:20:47.000000000 +0000
++++ softmmu/cpus.c
 @@ -42,6 +42,7 @@
  #include "sysemu/hax.h"
  #include "sysemu/hvf.h"
diff --git a/emulators/qemu/patches/patch-util_drm.c b/emulators/qemu/patches/patch-util_drm.c
deleted file mode 100644
index b0e95a9e145..00000000000
--- a/emulators/qemu/patches/patch-util_drm.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-util_drm.c,v 1.1 2019/12/11 16:44:22 jperkin Exp $
-
-Support SunOS.
-
---- util/drm.c.orig	2019-08-15 19:01:43.000000000 +0000
-+++ util/drm.c
-@@ -38,7 +38,13 @@ int qemu_drm_rendernode_open(const char
- 
-     fd = -1;
-     while ((e = readdir(dir))) {
-+#ifdef __sun
-+	struct stat s;
-+	stat(e->d_name, &s);
-+	if (!(s.st_mode & S_IFCHR)) {
-+#else
-         if (e->d_type != DT_CHR) {
-+#endif
-             continue;
-         }
-