The following changes since commit a5fac424c76d6401ecde4ecb7d846e656d0d6e89:
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2020-10-26 10:33:59 +0000) are available in the Git repository at: git://github.com/awilliam/qemu-vfio.git tags/vfio-update-20201026.0 for you to fetch changes up to 5219bf8e0fa86573427aa8812bbfe93d83c3d664: vfio: fix incorrect print type (2020-10-26 12:07:46 -0600) ---------------------------------------------------------------- VFIO update 2020-10-26 * Migration support (Kirti Wankhede) * s390 DMA limiting (Matthew Rosato) * zPCI hardware info (Matthew Rosato) * Lock guard (Amey Narkhede) * Print fixes (Zhengui li) ---------------------------------------------------------------- Amey Narkhede (1): hw/vfio: Use lock guard macros Kirti Wankhede (17): vfio: Add function to unmap VFIO region vfio: Add vfio_get_object callback to VFIODeviceOps vfio: Add save and load functions for VFIO PCI devices vfio: Add migration region initialization and finalize function vfio: Add VM state change handler to know state of VM vfio: Add migration state change notifier vfio: Register SaveVMHandlers for VFIO device vfio: Add save state functions to SaveVMHandlers vfio: Add load state functions to SaveVMHandlers memory: Set DIRTY_MEMORY_MIGRATION when IOMMU is enabled vfio: Get migration capability flags for container vfio: Add function to start and stop dirty pages tracking vfio: Add vfio_listener_log_sync to mark dirty pages vfio: Dirty page tracking when vIOMMU is enabled vfio: Add ioctl to get dirty pages bitmap during dma unmap vfio: Make vfio-pci device migration capable qapi: Add VFIO devices migration stats in Migration stats Matthew Rosato (10): update-linux-headers: Add vfio_zdev.h linux-headers: update against 5.10-rc1 s390x/pci: Move header files to include/hw/s390x vfio: Create shared routine for scanning info capabilities vfio: Find DMA available capability s390x/pci: Add routine to get the vfio dma available count s390x/pci: Honor DMA limits set by vfio s390x/pci: clean up s390 PCI groups vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities s390x/pci: get zPCI function info from host Pierre Morel (3): s390x/pci: create a header dedicated to PCI CLP s390x/pci: use a PCI Group structure s390x/pci: use a PCI Function structure Zhengui Li (1): vfio: fix incorrect print type MAINTAINERS | 1 + hw/s390x/meson.build | 1 + hw/s390x/s390-pci-bus.c | 91 +- hw/s390x/s390-pci-inst.c | 78 +- hw/s390x/s390-pci-vfio.c | 276 ++++++ hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/trace-events | 6 + hw/vfio/common.c | 507 ++++++++++- hw/vfio/meson.build | 1 + hw/vfio/migration.c | 933 +++++++++++++++++++++ hw/vfio/pci.c | 87 +- hw/vfio/pci.h | 1 - hw/vfio/platform.c | 7 +- hw/vfio/trace-events | 21 + {hw => include/hw}/s390x/s390-pci-bus.h | 22 + .../hw/s390x/s390-pci-clp.h | 123 +-- include/hw/s390x/s390-pci-inst.h | 119 +++ include/hw/s390x/s390-pci-vfio.h | 23 + include/hw/vfio/vfio-common.h | 30 + .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- include/standard-headers/linux/ethtool.h | 2 + include/standard-headers/linux/fuse.h | 50 +- include/standard-headers/linux/input-event-codes.h | 4 + include/standard-headers/linux/pci_regs.h | 6 +- include/standard-headers/linux/virtio_fs.h | 3 + include/standard-headers/linux/virtio_gpu.h | 19 + include/standard-headers/linux/virtio_mmio.h | 11 + include/standard-headers/linux/virtio_pci.h | 11 +- linux-headers/asm-arm64/kvm.h | 25 + linux-headers/asm-arm64/mman.h | 1 + linux-headers/asm-generic/hugetlb_encode.h | 1 + linux-headers/asm-generic/unistd.h | 18 +- linux-headers/asm-mips/unistd_n32.h | 1 + linux-headers/asm-mips/unistd_n64.h | 1 + linux-headers/asm-mips/unistd_o32.h | 1 + linux-headers/asm-powerpc/unistd_32.h | 1 + linux-headers/asm-powerpc/unistd_64.h | 1 + linux-headers/asm-s390/unistd_32.h | 1 + linux-headers/asm-s390/unistd_64.h | 1 + linux-headers/asm-x86/kvm.h | 20 + linux-headers/asm-x86/unistd_32.h | 1 + linux-headers/asm-x86/unistd_64.h | 1 + linux-headers/asm-x86/unistd_x32.h | 1 + linux-headers/linux/kvm.h | 19 + linux-headers/linux/mman.h | 1 + linux-headers/linux/vfio.h | 29 +- linux-headers/linux/vfio_zdev.h | 78 ++ migration/migration.c | 17 + monitor/hmp-cmds.c | 6 + qapi/migration.json | 17 + scripts/update-linux-headers.sh | 2 +- softmmu/memory.c | 2 +- 52 files changed, 2466 insertions(+), 217 deletions(-) create mode 100644 hw/s390x/s390-pci-vfio.c create mode 100644 hw/vfio/migration.c rename {hw => include/hw}/s390x/s390-pci-bus.h (94%) rename hw/s390x/s390-pci-inst.h => include/hw/s390x/s390-pci-clp.h (59%) create mode 100644 include/hw/s390x/s390-pci-inst.h create mode 100644 include/hw/s390x/s390-pci-vfio.h create mode 100644 linux-headers/linux/vfio_zdev.h