qemu: updated to 5.0.0

5.0.0:
Incompatible changes
The bluetooth code has been removed without replacement. It was quite neglected over the years and likely not usable anymore. You can passthrough a dedicated USB bluetooth dongle to guests on most machines instead if you still need bluetooth in your guest.
The pc-0.12, pc-0.13, pc-0.14, pc-0.15 machines have been removed. Newer versions of the machine type should be used instead.
The "prep" ppc machine has been removed. The "40p" machine should be used now instead.
The "-virtfs_synth" option has been removed. You can use "-fsdev synth" together with "-device virtio-9p-..." instead.
The "-accel" and "-machine accel=" options are now incompatible with each other.
The deprecated "[hub_id name]" parameter tuple of 'hostfwd_add' / 'hostfwd_remove' has been removed. Use a "netdev_id" instead.

New deprecated options and features
The "-tb-size N" option has been deprecated. It is replaced by "-accel tcg,tb-size=N".
The virtio-blk SCSI passthrough feature (" -device virtio-blk,scsi=on") is deprecated. Use virtio-scsi instead.
The "r4k" mips machine has been deprecated. The "malta" machine should be used nowadays instead.
Support for using an AArch32 host system to run KVM guests has been deprecated (because the Linux kernel has dropped its support for this) and will be removed in a future version of QEMU. AArch32 guests on an AArch64 host are still supported.

Arm
Support for using an AArch32 host system to run KVM guests is now deprecated (because the Linux kernel has dropped its support for this) and will be removed in a future version of QEMU. AArch32 guests on an AArch64 host are still supported.
Emulation of the following architecture features is now implemented:
- ARMv8.1-VHE
- ARMv8.1-VMID16
- ARMv8.1-PAN
- ARMv8.1-PMU
- ARMv8.2-UAO
- ARMv8.2-DCPoP
- ARMv8.2-ATS1E1
- ARMv8.2-TTCNP
- ARMv8.3-RCPC
- ARMv8.3-CCIDX
- ARMv8.4-PMU
- ARMv8.4-RCPC
The Cortex-M7 CPU is now supported
New board: tacoma-bmc
New board: Netduino Plus 2
New board: Orangepi PC (orangepi-pc)
QEMU now correctly implements trapping of more EL1 system register accesses to EL2 (eg HCR_EL2 TID1, TID2 bits, HSTR_EL2)
The no-op system registers required for a "trivial Jazelle" implementation have been added
The DC CVAP and DC CVADP instructions are now supported
Support for blocking semiconsole SYS_READC
the i.MX RNGC device is now supported
the watchdog device is now implemented on the i.MX6 boards
The Cortex-R5 and -R5f CPUs now provide a PMU
The Exynos4210 SoC model now correctly handles DMA to/from the UARTs
The Aspeed AST2600 SoC model now includes the eMMC controller
Under KVM, we now by default stop and restart the guest generic timer counter when the VM is stopped and started so the guest OS doesn't see surprising time jumps. (This can be disabled with the kvm-no-adjvtime property.)
The Aspeed AST2400, AST2500, AST2600 SoCs now support the EHCI controller
The z2 and mainstone boards now permit booting with just a kernel image and no flash image file
The Allwinner SoC model now wires up the USB ports
The integratorcp board now wires up the audio codec controller
The versal board now implements the ADMA DMA controllers
TPM is now supported
The iMX25 now wires up the eSDHC controllers and the USB controllers
The iMX6 machines wire up the USB controllers
the gdbstub now supports SVE registers
virtio-iommu is now supported with machvirt (DT boot only)

HPPA
Artist graphics emulation added.
PS2 keyboard and mouse added to LASI chip.
Accept LDCW to addresses not aligned mod 16.

MIPS
Support for R4000 machine is announced to be deprecated, and will be removed from code base in QEMU 5.2.
Amended support for MemoryMapID CP0 register.
Amended support for WatchHi CP0 register.
Added support for GINVT instruction.

OpenRISC
Fixed a bug that prevented the DZF bit of the FPCSR being set.

PowerPC
pseries machine type
- No longer require a reconfiguration reboot for a guest selecting XIVE interrupt controller when ic-mode=dual
- Now consumes less host resources when running a KVM guest with XIVE (with a recent enough host kernel). This allows running more concurrent guests with KVM accelerated XIVE.
- New 'kernel-addr' property to control the load address for -kernel
- NVDIMMs with file backend now supported
- If a guest panics with the ibm,os-term RTAS call, the error message it supplies is now reported
- Added firmware assisted NMI (FWNMI) support
- SLOF updated to work with iommu_platform=on for virtio devices
- Better handling of devices hotplugged early in boot (before the ibm,client-architecture-support call)
powernv machine type
- Numerous improvements to the model
- Can now run KVM guests under a TCG emulated powernv machine
- Basic POWER10 support
Removed num-chips machine property, use -smp sockets=NN instead
Deprecated the compat= property on CPUs (it's been obsolete for a while with a pseries specific machine property)
Fixed a longstanding bug if using big-endian ABIv2 binaries with linux-user
Implemented new forms of the slbia instruction present in POWER9

RISC-V
The virt and sifive_u boards now have syscon device tree nodes, which allows the generic syscon drivers in Linux to control power/reboot.
The GDB stub now allows for D on rv32 and non-D on rv64.
The virt board now contains a Goldfish RTC.
Experimental support for version 0.5 of the draft hypervisor extension has been added.

s390
Adpater interrupt suppression is now available when running with KVM (previously disabled due to migration issues); support under tcg has already been available since 2.10
- enable by specifying the cpu feature "ais=on"
QEMU now warns when it fixes up odd memory sizes for compatibility on compat machines
- Only done on compat machines to avoid breaking incoming migrations. If you can, fix up the memory size on old machines or switch to a machine type >= 5.0, which supports 1M increments
- The automatic fixup may be removed in a future version.

6 files changed, 136 insertions, 73 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 3e295efc8af..e1e3977ec6c 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.236 2020/03/13 13:57:04 tnn Exp $
+# $NetBSD: Makefile,v 1.237 2020/04/30 17:16:04 adam Exp $
 
-DISTNAME=	qemu-4.2.0
-PKGREVISION=	12
+DISTNAME=	qemu-5.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 36acb12b5c7..cab6707d586 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.65 2020/01/10 20:27:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.66 2020/04/30 17:16:04 adam Exp $
 bin/elf2dmp
 ${PLIST.ivshmem}bin/ivshmem-client
 ${PLIST.ivshmem}bin/ivshmem-server
@@ -40,6 +40,7 @@ ${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
 bin/qemu-system-arm
@@ -61,6 +62,7 @@ bin/qemu-system-ppc
 bin/qemu-system-ppc64
 bin/qemu-system-riscv32
 bin/qemu-system-riscv64
+bin/qemu-system-rx
 bin/qemu-system-s390x
 bin/qemu-system-sh4
 bin/qemu-system-sh4eb
@@ -88,7 +90,10 @@ man/man8/qemu-ga.8
 man/man8/qemu-nbd.8
 share/applications/qemu.desktop
 share/doc/qemu/Makefile.multinode-NetBSD
+share/doc/qemu/index.html
 share/doc/qemu/interop/bitmaps.html
+share/doc/qemu/interop/dbus-vmstate.html
+share/doc/qemu/interop/dbus.html
 share/doc/qemu/interop/genindex.html
 share/doc/qemu/interop/index.html
 share/doc/qemu/interop/live-block-operations.html
@@ -99,8 +104,6 @@ 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-doc.html
-share/doc/qemu/qemu-doc.txt
 share/doc/qemu/qemu-ga-ref.html
 share/doc/qemu/qemu-ga-ref.txt
 share/doc/qemu/qemu-qmp-ref.html
@@ -113,6 +116,74 @@ share/doc/qemu/specs/ppc-spapr-xive.html
 share/doc/qemu/specs/ppc-xive.html
 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/arm/cpu-features.html
+share/doc/qemu/system/arm/integratorcp.html
+share/doc/qemu/system/arm/musicpal.html
+share/doc/qemu/system/arm/nseries.html
+share/doc/qemu/system/arm/orangepi.html
+share/doc/qemu/system/arm/palm.html
+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/xscale.html
+share/doc/qemu/system/build-platforms.html
+share/doc/qemu/system/deprecated.html
+share/doc/qemu/system/gdb.html
+share/doc/qemu/system/genindex.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/mux-chardev.html
+share/doc/qemu/system/net.html
+share/doc/qemu/system/objects.inv
+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/vfio-ap.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-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-s390x.html
+share/doc/qemu/system/target-sparc.html
+share/doc/qemu/system/target-sparc64.html
+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/vnc-security.html
+share/doc/qemu/tools/.buildinfo
+share/doc/qemu/tools/genindex.html
+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-trace-stap.html
+share/doc/qemu/tools/search.html
+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/genindex.html
+share/doc/qemu/user/index.html
+share/doc/qemu/user/main.html
+share/doc/qemu/user/objects.inv
+share/doc/qemu/user/search.html
+share/doc/qemu/user/searchindex.js
 share/icons/hicolor/128x128/apps/qemu.png
 share/icons/hicolor/16x16/apps/qemu.png
 share/icons/hicolor/24x24/apps/qemu.png
@@ -202,13 +273,13 @@ share/qemu/multiboot.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/palcode-clipper
 share/qemu/petalogix-ml605.dtb
 share/qemu/petalogix-s3adsp1800.dtb
-share/qemu/ppc_rom.bin
 share/qemu/pvh.bin
 share/qemu/pxe-e1000.rom
 share/qemu/pxe-eepro100.rom
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index d7b8dc59447..90a2efa8828 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.157 2020/03/13 13:57:04 tnn Exp $
+$NetBSD: distinfo,v 1.158 2020/04/30 17:16:04 adam Exp $
 
-SHA1 (qemu-4.2.0.tar.xz) = b27aa828a8457bd8551ae3c81b80cc365e1f6bfe
-RMD160 (qemu-4.2.0.tar.xz) = cab8f6d85c0c6e9c01059087ed27d1243a7004a4
-SHA512 (qemu-4.2.0.tar.xz) = 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
-Size (qemu-4.2.0.tar.xz) = 62222068 bytes
+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 (patch-accel_stubs_nvmm-stub.c) = d66d47eabb8bb6728e777da7589b43d491adbcc8
 SHA1 (patch-accel_tcg_user-exec.c) = 86ee62f6e5c8cd7942cf0aa9c9f64e4b0879ff33
 SHA1 (patch-capstone_Makefile) = f59870031de8c4385a591362749ec82f57fd4c27
-SHA1 (patch-configure) = c2d68edf08e94ea12c9e57da3dacb0c1326c1213
+SHA1 (patch-configure) = 993ed55b8e63c3022c5afc3dbc3f0eacbebdd61b
 SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
 SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
 SHA1 (patch-cpus.c) = a319b7533daf3036c44411c4b26270b1fbb96009
@@ -23,8 +23,7 @@ SHA1 (patch-include_sysemu_hw__accel.h) = e5f581fa0539e55a6a1d559b94e94d47aedb88
 SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
 SHA1 (patch-include_sysemu_nvmm.h) = 3bd3da9b42ace0f806fabeb580f90ae19c273869
 SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
-SHA1 (patch-qemu-doc.texi) = 78f926a16494c07248b9a81f39dca5b78ae542bb
-SHA1 (patch-qemu-options.hx) = 17fb92e03e32402ea2c04217991a2cd01a335e02
+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-target_i386_Makefile.objs) = be8ab2e72521ccd0a71db6b37feb9957b27ac970
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
index e2900d98e9a..a8904957a7b 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.26 2020/02/06 16:46:17 kamil Exp $
+$NetBSD: patch-configure,v 1.27 2020/04/30 17:16:04 adam Exp $
 
-configure: Add HAX support in NetBSD
 Add NVMM support.
+Fix jemalloc detection.
 
---- configure.orig	2020-02-06 16:24:52.903915848 +0000
+--- configure.orig	2020-04-28 16:49:25.000000000 +0000
 +++ configure
 @@ -241,6 +241,17 @@ supported_whpx_target() {
      return 1
@@ -31,7 +31,7 @@ Add NVMM support.
      print_error "TCG disabled, but hardware accelerator not available for '$target'"
      return 1
  }
-@@ -387,6 +399,7 @@ kvm="no"
+@@ -389,6 +401,7 @@ kvm="no"
  hax="no"
  hvf="no"
  whpx="no"
@@ -39,7 +39,7 @@ Add NVMM support.
  rdma=""
  pvrdma=""
  gprof="no"
-@@ -822,6 +835,7 @@ DragonFly)
+@@ -837,6 +850,7 @@ DragonFly)
  NetBSD)
    bsd="yes"
    hax="yes"
@@ -47,7 +47,7 @@ Add NVMM support.
    make="${MAKE-gmake}"
    audio_drv_list="oss try-sdl"
    audio_possible_drivers="oss sdl"
-@@ -1172,6 +1186,10 @@ for opt do
+@@ -1210,6 +1224,10 @@ for opt do
    ;;
    --enable-whpx) whpx="yes"
    ;;
@@ -58,7 +58,7 @@ Add NVMM support.
    --disable-tcg-interpreter) tcg_interpreter="no"
    ;;
    --enable-tcg-interpreter) tcg_interpreter="yes"
-@@ -1768,6 +1786,7 @@ disabled with --disable-FEATURE, default
+@@ -1832,6 +1850,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 @@ Add NVMM support.
    rdma            Enable RDMA-based migration
    pvrdma          Enable PVRDMA support
    vde             support for vde network
-@@ -2758,6 +2777,20 @@ if test "$whpx" != "no" ; then
+@@ -2871,6 +2890,20 @@ if test "$whpx" != "no" ; then
  fi
  
  ##########################################
@@ -87,7 +87,21 @@ Add NVMM support.
  # Sparse probe
  if test "$sparse" != "no" ; then
    if has cgcc; then
-@@ -6522,6 +6555,7 @@ echo "KVM support       $kvm"
+@@ -4586,8 +4619,11 @@ if test "$jemalloc" = "yes" ; then
+ int main(void) { malloc(1); return 0; }
+ EOF
+ 
+-  if compile_prog "" "-ljemalloc" ; then
+-    LIBS="-ljemalloc $LIBS"
++  jemalloc_cflags=$($pkg_config --cflags jemalloc)
++  jemalloc_libs=$($pkg_config --libs jemalloc)
++  if compile_prog "" "$jemalloc_libs" ; then
++    LIBS="$jemalloc_libs $LIBS"
++    QEMU_CFLAGS="$QEMU_CFLAGS $jemalloc_cflags"
+   else
+     feature_not_found "jemalloc" "install jemalloc devel"
+   fi
+@@ -6651,6 +6687,7 @@ echo "KVM support       $kvm"
  echo "HAX support       $hax"
  echo "HVF support       $hvf"
  echo "WHPX support      $whpx"
@@ -95,7 +109,7 @@ Add NVMM support.
  echo "TCG support       $tcg"
  if test "$tcg" = "yes" ; then
      echo "TCG debug enabled $debug_tcg"
-@@ -7811,6 +7845,9 @@ fi
+@@ -8001,6 +8038,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-qemu-doc.texi b/emulators/qemu/patches/patch-qemu-doc.texi
deleted file mode 100644
index 6b3f7dc6cfa..00000000000
--- a/emulators/qemu/patches/patch-qemu-doc.texi
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-qemu-doc.texi,v 1.1 2019/12/15 18:35:49 adam Exp $
-
-Remove reference to nonexistent node `QEMU Guest Agent'.
-
---- qemu-doc.texi.orig	2019-12-15 14:15:26.000000000 +0000
-+++ qemu-doc.texi
-@@ -38,7 +38,6 @@
- * Introduction::
- * QEMU PC System emulator::
- * QEMU System emulator for non PC targets::
--* QEMU Guest Agent::
- * QEMU User space emulator::
- * System requirements::
- * Security::
diff --git a/emulators/qemu/patches/patch-qemu-options.hx b/emulators/qemu/patches/patch-qemu-options.hx
index a00da6c663a..9bab58d7d10 100644
--- a/emulators/qemu/patches/patch-qemu-options.hx
+++ b/emulators/qemu/patches/patch-qemu-options.hx
@@ -1,48 +1,42 @@
-$NetBSD: patch-qemu-options.hx,v 1.1 2020/02/06 16:46:17 kamil Exp $
+$NetBSD: patch-qemu-options.hx,v 1.2 2020/04/30 17:16:04 adam Exp $
 
 Add NVMM support.
 
---- qemu-options.hx.orig	2019-12-12 18:20:48.000000000 +0000
+--- qemu-options.hx.orig	2020-04-28 16:49:25.000000000 +0000
 +++ qemu-options.hx
-@@ -31,7 +31,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_mach
+@@ -26,7 +26,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_mach
      "-machine [type=]name[,prop[=value][,...]]\n"
      "                selects emulated machine ('-machine help' for list)\n"
      "                property accel=accel1[:accel2[:...]] selects accelerator\n"
 -    "                supported accelerators are kvm, xen, hax, hvf, whpx or tcg (default: tcg)\n"
 +    "                supported accelerators are kvm, xen, hax, hvf, nvmm, whpx or tcg (default: tcg)\n"
-     "                kernel_irqchip=on|off|split controls accelerated irqchip support (default=off)\n"
      "                vmport=on|off|auto controls emulation of vmport (default: auto)\n"
-     "                kvm_shadow_mem=size of KVM shadow MMU in bytes\n"
-@@ -66,9 +66,9 @@ Supported machine properties are:
- @table @option
- @item accel=@var{accels1}[:@var{accels2}[:...]]
- This is used to enable an accelerator. Depending on the target architecture,
--kvm, xen, hax, hvf, whpx or tcg can be available. By default, tcg is used. If there is
--more than one accelerator specified, the next one is used if the previous one
--fails to initialize.
-+kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. By default, tcg is used.
-+If there is more than one accelerator specified, the next one is used if the
-+previous one fails to initialize.
- @item kernel_irqchip=on|off
- Controls in-kernel irqchip support for the chosen accelerator when available.
- @item gfx_passthru=on|off
-@@ -119,15 +119,15 @@ ETEXI
+     "                dump-guest-core=on|off include guest memory in a core dump (default=on)\n"
+     "                mem-merge=on|off controls memory merge support (default: on)\n"
+@@ -58,7 +58,7 @@ SRST
+ 
+     ``accel=accels1[:accels2[:...]]``
+         This is used to enable an accelerator. Depending on the target
+-        architecture, kvm, xen, hax, hvf, whpx or tcg can be available.
++        architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available.
+         By default, tcg is used. If there is more than one accelerator
+         specified, the next one is used if the previous one fails to
+         initialize.
+@@ -119,7 +119,7 @@ ERST
  
  DEF("accel", HAS_ARG, QEMU_OPTION_accel,
-     "-accel [accel=]accelerator[,thread=single|multi]\n"
+     "-accel [accel=]accelerator[,prop[=value][,...]]\n"
 -    "                select accelerator (kvm, xen, hax, hvf, whpx or tcg; use 'help' for a list)\n"
 +    "                select accelerator (kvm, xen, hax, hvf, nvmm, whpx or tcg; use 'help' for a list)\n"
-     "                thread=single|multi (enable multi-threaded TCG)\n", QEMU_ARCH_ALL)
- STEXI
- @item -accel @var{name}[,prop=@var{value}[,...]]
- @findex -accel
- This is used to enable an accelerator. Depending on the target architecture,
--kvm, xen, hax, hvf, whpx or tcg can be available. By default, tcg is used. If there is
--more than one accelerator specified, the next one is used if the previous one
--fails to initialize.
-+kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. By default, tcg is used.
-+If there is more than one accelerator specified, the next one is used if the
-+previous one fails to initialize.
- @table @option
- @item thread=single|multi
- Controls number of TCG threads. When the TCG is multi-threaded there will be one
+     "                igd-passthru=on|off (enable Xen integrated Intel graphics passthrough, default=off)\n"
+     "                kernel-irqchip=on|off|split controls accelerated irqchip support (default=on)\n"
+     "                kvm-shadow-mem=size of KVM shadow MMU in bytes\n"
+@@ -128,7 +128,7 @@ DEF("accel", HAS_ARG, QEMU_OPTION_accel,
+ SRST
+ ``-accel name[,prop=value[,...]]``
+     This is used to enable an accelerator. Depending on the target
+-    architecture, kvm, xen, hax, hvf, whpx or tcg can be available. By
++    architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. By
+     default, tcg is used. If there is more than one accelerator
+     specified, the next one is used if the previous one fails to
+     initialize.