The following changes since commit e93d8bcf9dbd5b8dd3b9ddbb1ece6a37e608f300:
Merge remote-tracking branch 'remotes/philmd/tags/mips-20210502' into staging (2021-05-03 12:05:12 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 9ba5db49aea924175b8f23edd388fa2452206d20: glib-compat: accept G_TEST_SLOW environment variable (2021-05-04 14:15:35 +0200) v1->v2: check for new-enough NetBSD, add another 0.57 preparation patch ---------------------------------------------------------------- * NetBSD NVMM support * RateLimit mutex * Prepare for Meson 0.57 upgrade ---------------------------------------------------------------- Joelle van Dyne (1): slirp: add configure option to disable smbd Paolo Bonzini (6): oslib-win32: do not rely on macro to get redefined function name ratelimit: protect with a mutex configure: reindent meson invocation configure: handle meson options that have changed type gitlab-ci: use --meson=internal for CFI jobs glib-compat: accept G_TEST_SLOW environment variable Reinoud Zandijk (4): Add NVMM accelerator: configure and build logic Add NVMM accelerator: x86 CPU support Add NVMM accelerator: acceleration enlightenments Add NVMM Accelerator: add maintainers for NetBSD/NVMM .gitlab-ci.yml | 10 +- MAINTAINERS | 11 + accel/Kconfig | 3 + block/block-copy.c | 2 + blockjob.c | 3 + configure | 119 ++-- include/glib-compat.h | 17 + include/qemu/ratelimit.h | 14 + include/sysemu/hw_accel.h | 1 + include/sysemu/nvmm.h | 26 + meson.build | 16 +- meson_options.txt | 2 + net/slirp.c | 16 +- qemu-options.hx | 8 +- target/i386/helper.c | 2 +- target/i386/meson.build | 1 + target/i386/nvmm/meson.build | 8 + target/i386/nvmm/nvmm-accel-ops.c | 111 ++++ target/i386/nvmm/nvmm-accel-ops.h | 24 + target/i386/nvmm/nvmm-all.c | 1226 +++++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 2 +- 21 files changed, 1562 insertions(+), 60 deletions(-) create mode 100644 include/sysemu/nvmm.h create mode 100644 target/i386/nvmm/meson.build create mode 100644 target/i386/nvmm/nvmm-accel-ops.c create mode 100644 target/i386/nvmm/nvmm-accel-ops.h create mode 100644 target/i386/nvmm/nvmm-all.c -- 2.31.1
