summary refs log tree commit diff stats
path: root/docs/system/device-url-syntax.rst.inc
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-05-06 18:56:17 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-05-06 18:56:17 +0100
commit4cc10cae64c51e17844dc4358481c393d7bf1ed4 (patch)
tree7fa52caea4e82de5a71e65f1769ebe90780ddd33 /docs/system/device-url-syntax.rst.inc
parentd90f154867ec0ec22fd719164b88716e8fd48672 (diff)
parent9ba5db49aea924175b8f23edd388fa2452206d20 (diff)
downloadfocaccia-qemu-4cc10cae64c51e17844dc4358481c393d7bf1ed4.tar.gz
focaccia-qemu-4cc10cae64c51e17844dc4358481c393d7bf1ed4.zip
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* NetBSD NVMM support
* RateLimit mutex
* Prepare for Meson 0.57 upgrade

# gpg: Signature made Tue 04 May 2021 13:15:37 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  glib-compat: accept G_TEST_SLOW environment variable
  gitlab-ci: use --meson=internal for CFI jobs
  configure: handle meson options that have changed type
  configure: reindent meson invocation
  slirp: add configure option to disable smbd
  ratelimit: protect with a mutex
  Add NVMM Accelerator: add maintainers for NetBSD/NVMM
  Add NVMM accelerator: acceleration enlightenments
  Add NVMM accelerator: x86 CPU support
  Add NVMM accelerator: configure and build logic
  oslib-win32: do not rely on macro to get redefined function name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/system/device-url-syntax.rst.inc')
0 files changed, 0 insertions, 0 deletions