Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, pci, virtio, vhost: fixes, features Beginning of merging vDPA, new PCI ID, a new virtio balloon stat, intel iommu rework fixing a couple of security problems (no CVEs yet), fixes all over the place. Signed-off-by:Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Wed 23 May 2018 15:41:32 BST # gpg: using RSA key 281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # 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: (28 commits) intel-iommu: rework the page walk logic util: implement simple iova tree intel-iommu: trace domain id during page walk intel-iommu: pass in address space when page walk intel-iommu: introduce vtd_page_walk_info intel-iommu: only do page walk for MAP notifiers intel-iommu: add iommu lock intel-iommu: remove IntelIOMMUNotifierNode intel-iommu: send PSI always even if across PDEs nvdimm: fix typo in label-size definition contrib/vhost-user-blk: enable protocol feature for vhost-user-blk hw/virtio: Fix brace Werror with clang 6.0.0 libvhost-user: Send messages with no data vhost-user+postcopy: Use qemu_set_nonblock virtio: support setting memory region based host notifier vhost-user: support receiving file descriptors in slave_read vhost-user: add Net prefix to internal state structure linux-headers: add kvm header for mips linux-headers: add unistd.h on all arches update-linux-headers.sh: unistd.h, kvm consistency ... Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- contrib/libvhost-user/libvhost-user.c 9 additions, 7 deletionscontrib/libvhost-user/libvhost-user.c
- contrib/vhost-user-blk/vhost-user-blk.c 7 additions, 0 deletionscontrib/vhost-user-blk/vhost-user-blk.c
- docs/specs/pci-ids.txt 1 addition, 0 deletionsdocs/specs/pci-ids.txt
- docs/virtio-balloon-stats.txt 2 additions, 0 deletionsdocs/virtio-balloon-stats.txt
- hw/i386/intel_iommu.c 296 additions, 100 deletionshw/i386/intel_iommu.c
- hw/i386/kvm/clock.c 1 addition, 1 deletionhw/i386/kvm/clock.c
- hw/i386/trace-events 3 additions, 2 deletionshw/i386/trace-events
- hw/mem/nvdimm.c 1 addition, 1 deletionhw/mem/nvdimm.c
- hw/pci-host/q35.c 11 additions, 6 deletionshw/pci-host/q35.c
- hw/virtio/trace-events 1 addition, 0 deletionshw/virtio/trace-events
- hw/virtio/vhost-user.c 42 additions, 3 deletionshw/virtio/vhost-user.c
- hw/virtio/vhost.c 7 additions, 0 deletionshw/virtio/vhost.c
- hw/virtio/virtio-balloon.c 2 additions, 0 deletionshw/virtio/virtio-balloon.c
- hw/virtio/virtio-pci.c 22 additions, 0 deletionshw/virtio/virtio-pci.c
- hw/virtio/virtio.c 13 additions, 0 deletionshw/virtio/virtio.c
- include/hw/i386/intel_iommu.h 12 additions, 7 deletionsinclude/hw/i386/intel_iommu.h
- include/hw/mem/nvdimm.h 1 addition, 1 deletioninclude/hw/mem/nvdimm.h
- include/hw/pci/pci.h 1 addition, 0 deletionsinclude/hw/pci/pci.h
- include/hw/virtio/virtio-bus.h 2 additions, 0 deletionsinclude/hw/virtio/virtio-bus.h
Loading
Please register or sign in to comment