]> git.proxmox.com Git - mirror_qemu.git/commit - trace/mem.h
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 4 Sep 2019 16:22:34 +0000 (17:22 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 4 Sep 2019 16:22:34 +0000 (17:22 +0100)
commita8b5ad8e1faef0d1bb3e550530328e8ec76fe87c
tree8b975dc3f75a6e9ea184eb335a8e952ab4b7021e
parent9de65783e188b6cc3816847e03602864921bf504
parenteeb39263aa9b05b4ac3f8d8e957958071834a7b6
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio,vhost: fixes, features, cleanups.

FLR support.
Misc fixes, cleanups.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 04 Sep 2019 12:53:35 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  libvhost-user: introduce and use vu_has_protocol_feature()
  libvhost-user: fix SLAVE_SEND_FD handling
  virtio-pci: Add Function Level Reset support
  virtio-rng: change default backend to rng-builtin
  virtio-rng: Keep the default backend out of VirtIORNGConf
  rng-builtin: add an RNG backend that uses qemu_guest_getrandom()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/core/machine.c
hw/virtio/virtio-pci.c