| Message ID | 20190313025418.8292-1-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 13 Mar 2019 at 02:54, Michael S. Tsirkin <mst@redhat.com> wrote: > > The following changes since commit 9d867123659ac32edd2a0b64cabe2dca544f1d0e: > > Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging (2019-03-12 18:31:56 +0000) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to 9040e6dfa8c3fed87695a3de555d2c775727bb51: > > i386, acpi: check acpi_memory_hotplug capacity in pre_plug (2019-03-12 22:31:21 -0400) > > ---------------------------------------------------------------- > pci, pc, virtio: features, fixes, cleanups > > intel-iommu scalable option > pcie acs emulation > beginning for vhost-user-blk reconnect and of vhost-user backend work > misc fixes and cleanups > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > ---------------------------------------------------------------- Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0 for any user-visible changes. -- PMM
The following changes since commit 9d867123659ac32edd2a0b64cabe2dca544f1d0e: Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging (2019-03-12 18:31:56 +0000) are available in the Git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to 9040e6dfa8c3fed87695a3de555d2c775727bb51: i386, acpi: check acpi_memory_hotplug capacity in pre_plug (2019-03-12 22:31:21 -0400) ---------------------------------------------------------------- pci, pc, virtio: features, fixes, cleanups intel-iommu scalable option pcie acs emulation beginning for vhost-user-blk reconnect and of vhost-user backend work misc fixes and cleanups Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- David Gibson (3): virtio-balloon: Don't mismatch g_malloc()/free (CID 1399146) virtio-balloon: Fix possible guest memory corruption with inflates & deflates virtio-balloon: Restore MADV_WILLNEED hint on balloon deflate Knut Omang (2): pcie: Add a simple PCIe ACS (Access Control Services) helper function gen_pcie_root_port: Add ACS (Access Control Services) capability Liu, Yi L (2): intel_iommu: scalable mode emulation intel_iommu: add 256 bits qi_desc support Marc-André Lureau (8): libvhost-user: fix clang enum-conversion warning vhost-user: define conventions for vhost-user backends vhost-user: simplify vhost_user_init/vhost_user_cleanup libvhost-user: exit by default on VHOST_USER_NONE vhost-user: wrap some read/write with retry handling vhost-user: split vhost_user_read() libvhost-user-glib: export vug_source_new() libvhost-user: add vu_queue_unpop() Wei Wang (1): virtio-balloon: fix a use-after-free case Wei Yang (4): nvdimm: fix typo in nvdimm_build_nvdimm_devices argument nvdimm: use *function* directly instead of allocating it again nvdimm: use NVDIMM_ACPI_IO_LEN for the proper IO size i386, acpi: check acpi_memory_hotplug capacity in pre_plug Xie Yongji (5): vhost-user: Support transferring inflight buffer between qemu and backend libvhost-user: Remove unnecessary FD flag check for event file descriptors libvhost-user: Introduce vu_queue_map_desc() libvhost-user: Support tracking inflight I/O in shared memory vhost-user-blk: Add support to get/set inflight buffer Yi Sun (1): intel_iommu: add scalable-mode option to make scalable mode work docs/interop/vhost-user.txt | 386 +++++++++++++++++++- Makefile | 2 +- docs/interop/vhost-user.json | 232 ++++++++++++ contrib/libvhost-user/libvhost-user-glib.h | 3 + contrib/libvhost-user/libvhost-user.h | 86 ++++- hw/i386/intel_iommu_internal.h | 54 ++- include/hw/acpi/ich9.h | 2 + include/hw/i386/intel_iommu.h | 28 +- include/hw/pci/pcie.h | 6 + include/hw/pci/pcie_port.h | 1 + include/hw/pci/pcie_regs.h | 4 + include/hw/virtio/vhost-backend.h | 10 + include/hw/virtio/vhost-user-blk.h | 3 +- include/hw/virtio/vhost-user-scsi.h | 2 +- include/hw/virtio/vhost-user.h | 2 +- include/hw/virtio/vhost.h | 18 + backends/cryptodev-vhost-user.c | 18 +- contrib/libvhost-user/libvhost-user-glib.c | 11 +- contrib/libvhost-user/libvhost-user.c | 468 ++++++++++++++++++++---- hw/acpi/ich9.c | 15 +- hw/acpi/nvdimm.c | 8 +- hw/acpi/piix4.c | 13 +- hw/block/vhost-user-blk.c | 50 ++- hw/i386/intel_iommu.c | 563 +++++++++++++++++++++++------ hw/i386/pc.c | 2 + hw/isa/lpc_ich9.c | 1 + hw/pci-bridge/gen_pcie_root_port.c | 4 + hw/pci-bridge/pcie_root_port.c | 4 + hw/pci/pcie.c | 38 ++ hw/scsi/vhost-user-scsi.c | 20 +- hw/virtio/vhost-stub.c | 4 +- hw/virtio/vhost-user.c | 163 ++++++++- hw/virtio/vhost.c | 96 +++++ hw/virtio/virtio-balloon.c | 78 +++- net/vhost-user.c | 13 +- MAINTAINERS | 1 + hw/i386/trace-events | 2 +- 37 files changed, 2128 insertions(+), 283 deletions(-) create mode 100644 docs/interop/vhost-user.json