CVS commit: pkgsrc/emulators/qemu

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 20 22:59:29 UTC 2021

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo
        pkgsrc/emulators/qemu/patches: patch-hw-mips-Kconfig
            patch-hw-mips-mipssim.c patch-hw_usb_dev-mtp.c
Added Files:
        pkgsrc/emulators/qemu/patches: patch-hw_mips_meson.build
            patch-meson.build
Removed Files:
        pkgsrc/emulators/qemu/patches: patch-Makefile
            patch-accel_stubs_Makefile.objs patch-accel_stubs_nvmm-stub.c
            patch-capstone_Makefile patch-configure
            patch-default-configs-mips-softmmu-common.mak
            patch-hw-mips-Makefiles.objs patch-hw_display_tcx.c
            patch-hw_pci-host_sabre.c patch-include_sysemu_hw__accel.h
            patch-include_sysemu_nvmm.h patch-qemu-options.hx
            patch-roms_u-boot-sam460ex_Makefile patch-softmmu_cpus.c
            patch-target_i386_Makefile.objs patch-target_i386_helper.c
            patch-target_i386_nvmm-all.c

Log Message:
Update to 5.2.0

Changelog:
IMPORTANT NOTE: in this release we have switched our build system to internally use Meson. Building should be broadly unchanged for most users, but please see the [[#Build Information|Build 
Information]] section of the changelog for details and for '''the list of new [[#Build Dependencies |build dependencies]] you now need to install'''.

== System emulation ==

=== Incompatible changes ===

=== New deprecated options and features ===

Consult the [https://www.qemu.org/docs/master/system/deprecated.html "Deprecated Features"] chapter of the QEMU System Emulation User's Guide for the full list of historically deprecated 
features/options.

In particular, note that the Unicore32 and lm32 guest support have been deprecated and will be removed in a future version. They are now only built if explicitly enabled in --target-list.

=== 68k ===

=== Alpha ===

=== Arm ===

* ARMv8.2 FEAT_FP16 (half-precision floating point) is now implemented for AArch32 emulation (AArch64 already supported this)
* AArch64 BTI is now supported in linux-user emulation mode (it was already implemented for system emulation)
* The SMMUv3 model now supports SMMUv3.2 range invalidation
* The sbsa-ref board now has an embedded controller model for guest powerdown and reboot requests
* The sbsa-ref board now has an SBSA-compatible generic watchdog device
* The Raspberry Pi boards now emulate the CPRMAN clock manager device
* Support for KVM on 32-bit host CPUs (deprecated in 5.0) has now been removed. (32-bit KVM guests on 64-bit hosts remain supported.)
* Two new board models in the mps2 family: mps2-an386 (Cortex-M4 based) and mps2-an500 (Cortex-M7 based)
* New board models in the raspi family: raspi3ap (the Pi 3 model A+), raspi0 (the Pi Zero) and raspi1ap (the Pi A+)
* New Nuvoton iBMC board models: npcm750-evb, quanta-gsj
* The 'max' CPU now implements a 48-bit physical address size when using TCG emulation.
* The 'virt' board supports kvm-steal-time (enabled by default for virt-5.2 and on) so that a guest OS can account for time when its CPUs were not running due to the host not scheduling the 
corresponding vCPU threads.

=== AVR ===

=== HPPA ===
* Added power button emulation
* Boots NetBSD
* Boots old Linux CDs, e.g debian-0.5 and debian-0.6.1
* Artist framebuffer fixes when running dtwm on HP-UX
* Artist graphics allows screen resolution up to 2048 x 2048 pixels
* fw_cfg interface added

=== Microblaze ===

=== MIPS ===

=== Nios2 ===

=== OpenRISC ===

=== PowerPC ===

* The pseries machine now respects the nvdimm= machine option (previously NVDIMMs could be attached even with nvdimm=off)
* The pseries machine now does a better job of reflecting the user specified NUMA distances in the guest (PAPR limitations mean it's still a pretty poor approximation, though)
* We now fail more gracefully if attempting to run an HPT guest as a nested KVM guest (which isn't supported in the kernel for now)
* spapr_vscsi should now properly report that it does not support hotplug
* The pnv machine now allows firmware images up to 16MiB, instead of just 4 MiB (this matches the limit on physical FSP machines)

=== Renesas RX ===

=== Renesas SH ===

=== RISC-V ===

* Improvements to the Ibex (OpenTitan) PLIC
* OpenSBI v0.8 included by default
* Generic OpenSBI platform used when no -bios argument is supplied
* Support for a noMMU Linux kernel with the `-kernel` option
* A dummy L2 cache controller for the sifive_u is now included
* Support for the SiFive OTP device
* PMPCFG CSR setting bug fixed for RV64
* Improvements to the floating point helpers
* Experimental Hypervisor support updated to v0.6.1 and bug fixes
* Support for NUMA sockets on Virt and Spike Machines
* Support for the Microchip PolarFire SoC Icicle Kit
* Fix for crash seen when running 'poweroff' command on virt machine
* virt and sifive_u machines allow a custom dtb argument
* Support for migrating machines

=== s390 ===
* KVM: The diagnose 0x318 instruction is now supported.
* TCG: More instructions that were introduced with the z14 are now emulated.
* zPCI: vfio-pci devices now report real hardware features for functions, instead of emulated values (needs host kernel support.)
* virtiofs is now also supported on s390x via ccw

=== SPARC ===

* sun4m: fix panic when booting NetBSD with the TCX framebuffer
* sun4u: fix for sabre PCI IRQs being lost due to memory overflow

=== TileGX ===

=== Tricore ===

=== x86 ===
* A new KVM feature which improves the handling of asynchronous page faults is available with ''-cpu ...,kvm-async-pf-int''.  This requires Linux 5.8.

=== Xtensa ===

* DFPU coprocessor with single and double precision floating point opcodes is now supported
* NMI is now supported

=== Device emulation and assignment ===

==== ACPI ====

==== Audio ====

==== Block devices ====

==== Graphics ====

==== Input devices ====

==== IPMI ====

==== Network devices ====

==== NVDIMM ====

==== NVMe ====
* Add support for mandatory features of version 1.3 of the NVM Express specification
* Add support for the Abort, Asynchronous Event Request and Get Log Page commands
* Add support for Scatter Gather Lists (supported descriptors: Data Block, Bit Bucket, Segment and Last Segment)
* Allow the device to be configured with the "Admin Only" command set
* Support multiple namespaces through the new nvme-ns device
* The unallocated Intel PCI Vendor and Device ID has been replaced with a QEMU allocated "Red Hat" ID
* Support per-namespace SMART log

==== PCI/PCIe ====

==== SCSI ====

==== SD card ====

==== SMBIOS ====
* The OEM Strings data can now be loaded from a file

==== TPM ====

==== USB ====

==== VFIO ====

==== virtio ====

==== Xen ====

==== fw_cfg ====

==== 9pfs ====
* Significant [https://lists.gnu.org/archive/html/qemu-devel/2020-01/msg05539.html performance improvement of Treaddir] requests.
* A performance warning is now logged on host side if 'msize' is set to a very small value, which especially includes Linux 9P clients not having any user specified 'msize' parameter at all. Simply 
setting 'msize' (on client/guest side) to any value larger than 8192 will cause the warning to disappear. See [https://wiki.qemu.org/Documentation/9psetup#msize msize documentation] for details.

==== virtiofs ====
* virtiofsd xattrmap option to allow the host to see different xattr names to the guest
* virtiofsd alternate sandbox option for environments where pivot_root isn't available
* virtiofsd 'submount' mechanism (requiring newer guest kernel) allows different host mounts to be seen as separate submounts in the guest, avoiding inode clashes.

==== Semihosting ====

=== Audio ===

=== Character devices ===

* Inverted logic in QAPI handling the "tight" option for abstract UNIX sockets was fixed.
* The QAPI schema now only reports support for abstract UNIX sockets on platforms where it is available (Linux).

=== Crypto subsystem ===

==== experimental qmp interface ====

=== GUI ===
* Spice: add support for SIDE and EXTRA mouse buttons. Improve HiDPI, set physical dimensions of client monitors.
* Build spice and opengl as modules

=== GDBStub ===

=== Host support ===

=== Memory backends ===

=== Migration ===
* A new 'block-bitmap-mapping' migration parameter is added, allowing finer control of which bitmaps to migrate, even when node names differ between source and destination.
* Migration over 'vsock' is now allowed, for nested environments or hosts with hardware that looks like a vsock.
* A new 'calc-dirty-rate'/'query-dirty-rate' call gathers an approximation of the rate at which the guest is dirtying RAM and thus gives an idea about whether precopy migration is likely to proceed.
* The default migration bandwidth has been increased to 1Gbps;  users are still encouraged to tune it to their own hardware.
* TLS+multifd is now supported for higher bandwidth encrypted migration.
* Migration with dirty bitmaps has several bugs fixed.

=== Monitor ===

==== QMP ====

* Command block_resize no longer blocks the main loop.

==== HMP ====

* Command block_resize no longer blocks the main loop.

=== Network ===

=== Block device backends and tools ===

* qcow2 files now support extended L2 entries that allow subcluster-based allocation (enable with <code>extended_l2=on</code> when creating the image).
* Using qemu as an NBD client has fewer scenarios where network timeouts stall guest execution
* More explicit errors are reported when use of O_DIRECT fails
* The 'block-export-add' QMP command has been introduced to support qemu-storage-daemon, and replaces the now-deprecated 'nbd-server-add' command.
* The 'vhost-user-blk' export type has been added, allowing qemu-storage-daemon to act as a vhost-user-blk device backend.
* qemu-nbd now supports multiple '-B name' options for exposing multiple dirty bitmaps at once; it also supports a new '-A' option for exposing the new "qemu:allocation-depth" metadata context over 
NBD.

=== Tracing ===

* Add support of dtrace backend on macOS

=== Miscellaneous ===

* The roms/edk2 submodule and the bundled edk2 binaries have been updated to [https://bugs.launchpad.net/qemu/+bug/1852196 edk2-stable202008].

== User-mode emulation ==

* ppc64abi32-linux-user is deprecated and only built when explicitly enabled in--target-list
* tilegx-linux-user is deprecated and only built when explicitly enabled in--target-list
* better reporting when we can't mmap the guest_base we want on systems without MAP_FIXED_NOREPLACE

== TCG ==

== Guest agent ==
* New commands: <code>guest-get-devices</code>, <code>guest-get-disks</code> & <code>guest-ssh-{get,add,remove}-authorized-keys</code>
* Support <code>guest-get-fsinfo</code> for non-PCI virtio devices, too

== Build Information ==
* The build system is now partly based on Meson. However, building is still done with ''configure'' and ''make'' as in previous versions of QEMU.
* Binaries for emulators are placed in the root build directory, for example as ''qemu-system-ppc'' instead of ''ppc-softmmu/qemu-system-ppc''. Symbolic links from the old binary are preserved to 
simplify the transition.
* In-tree builds are not supported anymore. The build system will try to cater for ''./configure && make && make install'' by building QEMU in a directory named ''build'', but you are encouraged to 
switch to out-of-tree builds instead.
* ivshmem-client and ivshmem-server are not installed anymore.  They are merely examples, and not to be used in production.
* QEMU installations are now relocatable.  For example, if QEMU is configured with ''bindir=/usr/local/bin'' and ''datadir=/usr/local/share'', when QEMU is launched as 
''/opt/local/qemu-5.2/bin/qemu-system-x86_64'' it will look automatically for data files in ''/opt/local/qemu-5.2/share''.  Note that directories configured outside the prefix (as is often the case 
for ''/etc'' and ''/var'') will not be relocated!  Previously this was done only under Windows and only for emulators.

=== Python ===

* Python 3.6 or newer is now required to build QEMU.

=== GIT submodules ===

=== Container Based Builds ===
* All Debian 9 based cross-compiler containers have been updated to Debian 10

=== Build Dependencies ===
* Ninja 1.7 or newer is now required to build QEMU:
  * '''$ apt-get install ninja-build'''  (Debian/Ubuntu and derivative distros)
  * '''$ dnf/yum install ninja-build'''  (RHEL/Fedora/CentOS and derivative distros)
  * '''$ brew install ninja''' (macOS with HomeBrew)
  * '''$ pkg install ninja''' (FreeBSD)

=== Windows ===
* qemu-nbd is now built on mingw, and works for simple cases even if it can't duplicate the full functionality available on Unix systems

=== Testing and CI ===
* a new script can wait on gitlab to finish with a pass/fail status (scripts/ci/gitlab-status)


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.169 -r1.170 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/emulators/qemu/patches/patch-Makefile \
    pkgsrc/emulators/qemu/patches/patch-target_i386_Makefile.objs \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm-all.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/emulators/qemu/patches/patch-accel_stubs_Makefile.objs \
    pkgsrc/emulators/qemu/patches/patch-include_sysemu_hw__accel.h \
    pkgsrc/emulators/qemu/patches/patch-qemu-options.hx
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/qemu/patches/patch-accel_stubs_nvmm-stub.c \
    pkgsrc/emulators/qemu/patches/patch-capstone_Makefile \
    pkgsrc/emulators/qemu/patches/patch-default-configs-mips-softmmu-common.mak \
    pkgsrc/emulators/qemu/patches/patch-hw-mips-Makefiles.objs \
    pkgsrc/emulators/qemu/patches/patch-hw_display_tcx.c \
    pkgsrc/emulators/qemu/patches/patch-hw_pci-host_sabre.c \
    pkgsrc/emulators/qemu/patches/patch-include_sysemu_nvmm.h \
    pkgsrc/emulators/qemu/patches/patch-roms_u-boot-sam460ex_Makefile \
    pkgsrc/emulators/qemu/patches/patch-softmmu_cpus.c \
    pkgsrc/emulators/qemu/patches/patch-target_i386_helper.c
cvs rdiff -u -r1.29 -r0 pkgsrc/emulators/qemu/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig \
    pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build \
    pkgsrc/emulators/qemu/patches/patch-meson.build
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/qemu/patches/patch-hw_usb_dev-mtp.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.262 pkgsrc/emulators/qemu/Makefile:1.263
--- pkgsrc/emulators/qemu/Makefile:1.262        Wed Feb 17 17:16:00 2021
+++ pkgsrc/emulators/qemu/Makefile      Sat Feb 20 22:59:29 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.262 2021/02/17 17:16:00 reinoud Exp $
+# $NetBSD: Makefile,v 1.263 2021/02/20 22:59:29 ryoon Exp $
 
-DISTNAME=      qemu-5.1.0
-PKGREVISION=   13
+DISTNAME=      qemu-5.2.0
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -26,6 +25,7 @@ SUBST_CLASSES+=                       sphinx-build
 SUBST_STAGE.sphinx-build=      pre-configure
 SUBST_MESSAGE.sphinx-build=    Fix hardcoded sphinx-build
 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_SED.sphinx-build+=       -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
@@ -61,7 +61,6 @@ NOT_PAX_MPROTECT_SAFE+=       bin/qemu-system-
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-cris
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-hppa
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-i386
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-lm32
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-m68k
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-microblaze
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-microblazeel
@@ -82,15 +81,12 @@ NOT_PAX_MPROTECT_SAFE+=     bin/qemu-system-
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-sparc
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-sparc64
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-tricore
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-unicore32
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-x86_64
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-xtensa
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-xtensaeb
 
 PKG_SYSCONFSUBDIR=     qemu
 
-REPLACE_PERL+=         scripts/texi2pod.pl
-
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/doc/qemu
 
 UE_ARCHS+=             aarch64 aarch64_be
@@ -146,6 +142,14 @@ post-extract:
        cp ${WRKDIR}/palcode-clipper ${WRKSRC}/pc-bios/palcode-clipper
        cp ${FILESDIR}/hw-mips-mipssim_virtio.c ${WRKSRC}/hw/mips/mipssim_virtio.c
 
+do-build:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+               ninja -j ${_MAKE_JOBS_N:U1} -C build
+
+do-install:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
+               ninja -j ${_MAKE_JOBS_N:U1} -C build install
+
 # Some dependencies aren't correct and this tries to be re-made on install,
 # failing due to configure bugs.
 post-build:
@@ -167,6 +171,7 @@ post-install:
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/jemalloc/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -176,7 +181,6 @@ post-install:
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.69 pkgsrc/emulators/qemu/PLIST:1.70
--- pkgsrc/emulators/qemu/PLIST:1.69    Fri Aug 14 06:08:11 2020
+++ pkgsrc/emulators/qemu/PLIST Sat Feb 20 22:59:29 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.69 2020/08/14 06:08:11 tnn Exp $
+@comment $NetBSD: PLIST,v 1.70 2021/02/20 22:59:29 ryoon Exp $
 bin/elf2dmp
 ${PLIST.ivshmem}bin/ivshmem-client
 ${PLIST.ivshmem}bin/ivshmem-server
@@ -47,7 +47,6 @@ bin/qemu-system-avr
 bin/qemu-system-cris
 bin/qemu-system-hppa
 bin/qemu-system-i386
-bin/qemu-system-lm32
 bin/qemu-system-m68k
 bin/qemu-system-microblaze
 bin/qemu-system-microblazeel
@@ -69,7 +68,6 @@ bin/qemu-system-sh4eb
 bin/qemu-system-sparc
 bin/qemu-system-sparc64
 bin/qemu-system-tricore
-bin/qemu-system-unicore32
 bin/qemu-system-x86_64
 bin/qemu-system-xtensa
 bin/qemu-system-xtensaeb
@@ -89,6 +87,7 @@ man/man7/qemu-ga-ref.7
 man/man7/qemu-qmp-ref.7
 man/man8/qemu-ga.8
 man/man8/qemu-nbd.8
+man/man8/qemu-pr-helper.8
 share/applications/qemu.desktop
 share/doc/qemu/Makefile.multinode-NetBSD
 share/doc/qemu/index.html
@@ -116,10 +115,8 @@ share/doc/qemu/interop/live-block-operat
 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
@@ -145,6 +142,7 @@ share/doc/qemu/specs/acpi_hw_reduced_hot
 share/doc/qemu/specs/genindex.html
 share/doc/qemu/specs/index.html
 share/doc/qemu/specs/objects.inv
+share/doc/qemu/specs/ppc-spapr-numa.html
 share/doc/qemu/specs/ppc-spapr-xive.html
 share/doc/qemu/specs/ppc-xive.html
 share/doc/qemu/specs/search.html
@@ -176,19 +174,26 @@ 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/nuvoton.html
 share/doc/qemu/system/arm/orangepi.html
 share/doc/qemu/system/arm/palm.html
+share/doc/qemu/system/arm/raspi.html
 share/doc/qemu/system/arm/realview.html
+share/doc/qemu/system/arm/sbsa.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/xlnx-versal-virt.html
 share/doc/qemu/system/arm/xscale.html
 share/doc/qemu/system/build-platforms.html
+share/doc/qemu/system/cpu-hotplug.html
 share/doc/qemu/system/deprecated.html
 share/doc/qemu/system/gdb.html
 share/doc/qemu/system/genindex.html
+share/doc/qemu/system/i386/microvm.html
+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
@@ -201,11 +206,13 @@ share/doc/qemu/system/monitor.html
 share/doc/qemu/system/mux-chardev.html
 share/doc/qemu/system/net.html
 share/doc/qemu/system/objects.inv
+share/doc/qemu/system/pr-manager.html
 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/bootdevices.html
 share/doc/qemu/system/s390x/css.html
 share/doc/qemu/system/s390x/protvirt.html
 share/doc/qemu/system/s390x/vfio-ap.html
@@ -227,6 +234,8 @@ 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/.buildinfo
 share/doc/qemu/tools/_static/alabaster.css
@@ -249,6 +258,7 @@ share/doc/qemu/tools/index.html
 share/doc/qemu/tools/objects.inv
 share/doc/qemu/tools/qemu-img.html
 share/doc/qemu/tools/qemu-nbd.html
+share/doc/qemu/tools/qemu-pr-helper.html
 share/doc/qemu/tools/qemu-trace-stap.html
 share/doc/qemu/tools/search.html
 share/doc/qemu/tools/searchindex.js
@@ -363,13 +373,14 @@ share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
 share/qemu/linuxboot_dma.bin
 share/qemu/multiboot.bin
+share/qemu/npcm7xx_bootrom.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
 share/qemu/openbios-sparc64
-share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin
-share/qemu/opensbi-riscv32-virt-fw_jump.bin
-share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
-share/qemu/opensbi-riscv64-virt-fw_jump.bin
+share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
+share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
+share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
 share/qemu/palcode-clipper
 share/qemu/petalogix-ml605.dtb
 share/qemu/petalogix-s3adsp1800.dtb
@@ -380,6 +391,7 @@ share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
+share/qemu/qboot.rom
 share/qemu/qemu-nsis.bmp
 share/qemu/qemu_vga.ndrv
 share/qemu/s390-ccw.img
@@ -399,5 +411,3 @@ share/qemu/vgabios-stdvga.bin
 share/qemu/vgabios-virtio.bin
 share/qemu/vgabios-vmware.bin
 share/qemu/vgabios.bin
-@pkgdir var/run
-@pkgdir include

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.169 pkgsrc/emulators/qemu/distinfo:1.170
--- pkgsrc/emulators/qemu/distinfo:1.169        Wed Feb 17 17:16:00 2021
+++ pkgsrc/emulators/qemu/distinfo      Sat Feb 20 22:59:29 2021
@@ -1,42 +1,32 @@
-$NetBSD: distinfo,v 1.169 2021/02/17 17:16:00 reinoud Exp $
+$NetBSD: distinfo,v 1.170 2021/02/20 22:59:29 ryoon Exp $
 
 SHA1 (palcode-clipper) = e25ae10a10e0801e47b62b9ee2d10c8ccb4ee940
 RMD160 (palcode-clipper) = a637f1cc38dabfdff36e3f02b6dd02d7c63cb8db
 SHA512 (palcode-clipper) = 8d6966e59b59bc17c563bae3648af4ac99108990294edd0398ee91d8e61ec8f890608b9326b175d6a3a5668106b67b019a2c51b79f5b2935d4a516d34490056c
 Size (palcode-clipper) = 156704 bytes
-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 (qemu-5.2.0.tar.xz) = 146578267387e301423502d19024f8ffe35ab332
+RMD160 (qemu-5.2.0.tar.xz) = 2c33e773f012e333f99237e3d4ff1653ea0bc88f
+SHA512 (qemu-5.2.0.tar.xz) = bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
+Size (qemu-5.2.0.tar.xz) = 106902800 bytes
 SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
-SHA1 (patch-capstone_Makefile) = f59870031de8c4385a591362749ec82f57fd4c27
-SHA1 (patch-configure) = 2f5689b83b58066865598a83d53be2de6b42e303
 SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
 SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
-SHA1 (patch-default-configs-mips-softmmu-common.mak) = 00d6a6e2dfc590b7e4883ed122964292d667e332
-SHA1 (patch-hw-mips-Kconfig) = 359de9f0c16543f58ba9741e4f05417ad6a9f86e
-SHA1 (patch-hw-mips-Makefiles.objs) = c9d523b9310970df27d02c766225f7c22d71ae08
-SHA1 (patch-hw-mips-mipssim.c) = 7c1ad117214fe130faa95c08f25b4545ee8fe0ab
+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_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
-SHA1 (patch-hw_display_tcx.c) = 58f6c90bda734ec83b702b1b13d24c3e3219c7bd
+SHA1 (patch-hw_mips_meson.build) = 4d1ed1ae2dbfb3edfe5fa5271c4561531b08efee
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
-SHA1 (patch-hw_pci-host_sabre.c) = 75c076757ed96fc9f89cb0159f00c6cedcb39a27
 SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
-SHA1 (patch-hw_usb_dev-mtp.c) = 0f9034fb3904e5d5e3b98d24b94e054181687d95
-SHA1 (patch-include_sysemu_hw__accel.h) = 852bc031a1e065f614c5c913351f3e13183e00b7
+SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
 SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
-SHA1 (patch-include_sysemu_nvmm.h) = 3bd3da9b42ace0f806fabeb580f90ae19c273869
+SHA1 (patch-meson.build) = 5f9e00312b2dc6a6b1c43b1f28d092e69b09091d
 SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
-SHA1 (patch-qemu-options.hx) = e2f264117f703aa4ccf56219f370c3b1303e8b07
 SHA1 (patch-roms_qemu-palcode_hwrpb.h) = ae7b4c0680367af6f740d62a54dc86352128d76f
 SHA1 (patch-roms_qemu-palcode_init.c) = 7a0ebcd86f4106318791e7d90273fb55a424f1b8
 SHA1 (patch-roms_qemu-palcode_memcpy.c) = 7761774ae9092d0f494deaf302d663ba479a09cf
@@ -48,11 +38,6 @@ SHA1 (patch-roms_qemu-palcode_printf.c) 
 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) = 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-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76

Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.2 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.3
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.2     Wed Feb 17 17:16:01 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig Sat Feb 20 22:59:29 2021
@@ -1,19 +1,13 @@
-$NetBSD: patch-hw-mips-Kconfig,v 1.2 2021/02/17 17:16:01 reinoud Exp $
+$NetBSD: patch-hw-mips-Kconfig,v 1.3 2021/02/20 22:59:29 ryoon Exp $
 
 --- hw/mips/Kconfig.orig       2020-08-11 19:17:15.000000000 +0000
 +++ hw/mips/Kconfig
-@@ -21,6 +21,14 @@ config MIPSSIM
+@@ -20,6 +20,8 @@ config MIPSSIM
+     select ISA_BUS
      select SERIAL_ISA
      select MIPSNET
- 
-+config MIPSSIM_VIRTIO
-+    bool
-+    select ISA_BUS
-+    select SERIAL_ISA
-+    select MIPSNET
 +    select VIRTIO_MMIO
 +    select OR_IRQ
-+
+ 
  config JAZZ
      bool
-     select ISA_BUS
Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.2 pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.3
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.2   Wed Feb 17 17:16:01 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c       Sat Feb 20 22:59:29 2021
@@ -1,23 +1,76 @@
-$NetBSD: patch-hw-mips-mipssim.c,v 1.2 2021/02/17 17:16:01 reinoud Exp $
+$NetBSD: patch-hw-mips-mipssim.c,v 1.3 2021/02/20 22:59:29 ryoon Exp $
 
---- hw/mips/mipssim.c.orig     2020-08-11 19:17:15.000000000 +0000
+--- hw/mips/mipssim.c.orig     2020-12-08 16:59:44.000000000 +0000
 +++ hw/mips/mipssim.c
-@@ -46,6 +46,8 @@
+@@ -39,6 +39,7 @@
+ #include "hw/boards.h"
+ #include "hw/mips/bios.h"
+ #include "hw/loader.h"
++#include "hw/or-irq.h"
+ #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"
- 
-+void mips_mipssim_init(MachineState *);
++#include "hw/virtio/virtio-mmio.h"
++
++#define NUM_VIRTIO_TRANSPORTS 32
 +
++#define DEV_SPACING           0x10000         /* space devices every 64k */
++#define ISA_BASE              0x1fd00000
++#define       VIRTIO_MMIO_BASE        (ISA_BASE + DEV_SPACING)
+ 
  static struct _loaderparams {
      int ram_size;
-     const char *kernel_filename;
-@@ -140,8 +142,7 @@ static void mipsnet_init(int base, qemu_
+@@ -136,7 +144,7 @@ static void mipsnet_init(int base, qemu_
                                  sysbus_mmio_get_region(s, 0));
  }
  
 -static void
--mips_mipssim_init(MachineState *machine)
-+void mips_mipssim_init(MachineState *machine)
++void
+ mips_mipssim_init(MachineState *machine)
  {
      const char *kernel_filename = machine->kernel_filename;
-     const char *kernel_cmdline = machine->kernel_cmdline;
+@@ -147,6 +155,7 @@ mips_mipssim_init(MachineState *machine)
+     MemoryRegion *isa = g_new(MemoryRegion, 1);
+     MemoryRegion *bios = g_new(MemoryRegion, 1);
+     Clock *cpuclk;
++    DeviceState *virtio_orgate;
+     MIPSCPU *cpu;
+     CPUMIPSState *env;
+     ResetData *reset_info;
+@@ -209,7 +218,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);
+-    memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa);
++    memory_region_add_subregion(get_system_memory(), ISA_BASE, isa);
+ 
+     /*
+      * A single 16450 sits at offset 0x3f8. It is attached to
+@@ -230,6 +239,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]);
++
++    /*
++     * virtio extention; register 32 virtio devices just after the ISA space
++     * at 0x1fd10000 with stride of 512 bytes as per i386s microvm target.
++     * register these devices in reverse order (see comments in hw/arm/virt.c)
++     */
++    virtio_orgate = DEVICE(object_new(TYPE_OR_IRQ));
++    object_property_set_int(OBJECT(virtio_orgate),
++         "num-lines", NUM_VIRTIO_TRANSPORTS, &error_fatal);
++    qdev_realize_and_unref(virtio_orgate, NULL, &error_fatal);
++
++    for (int i = NUM_VIRTIO_TRANSPORTS - 1; i >= 0; i--) {
++        sysbus_create_simple("virtio-mmio",
++            0x1fd10000 + i * 512,
++            qdev_get_gpio_in(virtio_orgate, i));
++    }
++    qdev_connect_gpio_out(DEVICE(virtio_orgate), 0, env->irq[3]);
+ }
+ 
+ static void mips_mipssim_machine_init(MachineClass *mc)

Index: pkgsrc/emulators/qemu/patches/patch-hw_usb_dev-mtp.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw_usb_dev-mtp.c:1.4 pkgsrc/emulators/qemu/patches/patch-hw_usb_dev-mtp.c:1.5
--- pkgsrc/emulators/qemu/patches/patch-hw_usb_dev-mtp.c:1.4    Fri Jun 28 17:11:14 2019
+++ pkgsrc/emulators/qemu/patches/patch-hw_usb_dev-mtp.c        Sat Feb 20 22:59:29 2021
@@ -1,12 +1,10 @@
-$NetBSD: patch-hw_usb_dev-mtp.c,v 1.4 2019/06/28 17:11:14 jperkin Exp $
+$NetBSD: patch-hw_usb_dev-mtp.c,v 1.5 2021/02/20 22:59:29 ryoon Exp $
 
-Support NAME_MAX and compat for O_DIRECTORY.
-
---- hw/usb/dev-mtp.c.orig      2019-04-23 18:14:46.000000000 +0000
+--- hw/usb/dev-mtp.c.orig      2020-12-08 16:59:44.000000000 +0000
 +++ hw/usb/dev-mtp.c
-@@ -26,6 +26,10 @@
- #include "desc.h"
+@@ -30,6 +30,10 @@
  #include "qemu/units.h"
+ #include "qom/object.h"
  
 +#ifndef NAME_MAX
 +#define NAME_MAX 255
@@ -15,7 +13,7 @@ Support NAME_MAX and compat for O_DIRECT
  /* ----------------------------------------------------------------------- */
  
  enum mtp_container_type {
-@@ -614,6 +618,9 @@ static void usb_mtp_object_readdir(MTPSt
+@@ -618,6 +622,9 @@ static void usb_mtp_object_readdir(MTPSt
      }
      o->have_children = true;
  

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.1
--- /dev/null   Sat Feb 20 22:59:29 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build     Sat Feb 20 22:59:29 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-hw_mips_meson.build,v 1.1 2021/02/20 22:59:29 ryoon Exp $
+
+--- hw/mips/meson.build.orig   2020-12-08 16:59:44.000000000 +0000
++++ hw/mips/meson.build
+@@ -3,7 +3,7 @@ mips_ss.add(files('addr.c', 'mips_int.c'
+ mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
+ 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_MIPS_BOSTON', if_true: [files('boston.c'), fdt])
+ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'))
+ 
Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-meson.build:1.1
--- /dev/null   Sat Feb 20 22:59:29 2021
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Sat Feb 20 22:59:29 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson.build,v 1.1 2021/02/20 22:59:29 ryoon Exp $
+
+* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
+  to fix qemu-system-aarch64 link.
+
+--- meson.build.orig   2020-12-08 16:59:44.000000000 +0000
++++ meson.build
+@@ -535,7 +535,7 @@ if have_system and not get_option('curse
+     endif
+   endif
+   if not get_option('iconv').disabled()
+-    foreach link_args : [ ['-liconv'], [] ]
++    foreach link_args : [ [], ['-liconv'] ]
+       # 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.