Failed in applying to current master (
apply log)
Maintainers: Yi Liu <yi.l.liu@intel.com>, Eric Auger <eric.auger@redhat.com>, Zhenzhong Duan <zhenzhong.duan@intel.com>, John Levon <john.levon@nutanix.com>, Thanos Makatos <thanos.makatos@nutanix.com>, "Cédric Le Goater" <clg@redhat.com>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Peter Maydell <peter.maydell@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, "Clément Mathieu--Drif" <clement.mathieu--drif@bull.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Alex Williamson <alex@shazbot.org>, Tony Krowiak <akrowiak@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Nicholas Piggin <npiggin@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>
docs/interop/vfio-user.rst | 8 +-
hw/arm/smmuv3-accel.h | 2 +-
hw/vfio-user/protocol.h | 14 ++-
hw/vfio/kvm-spapr.h | 12 +++
hw/vfio/pci.h | 2 +
include/hw/core/iommu.h | 2 +
include/hw/vfio/vfio-device.h | 14 +++
include/system/iommufd.h | 12 +--
target/s390x/kvm/kvm_s390x.h | 2 +-
backends/iommufd.c | 26 +++---
hw/arm/smmuv3-accel.c | 93 ++++++++++----------
hw/i386/intel_iommu.c | 7 +-
hw/i386/intel_iommu_accel.c | 44 +++++-----
hw/vfio-user/device.c | 42 +++++++++
hw/vfio-user/pci.c | 30 +++++--
hw/vfio/ap.c | 11 +--
hw/vfio/ccw.c | 9 --
hw/vfio/container-legacy.c | 10 +--
hw/vfio/device.c | 13 +++
hw/vfio/helpers.c | 172 -------------------------------------
hw/vfio/igd-stubs.c | 20 +++++
hw/vfio/iommufd.c | 35 +++++---
hw/vfio/kvm-helpers.c | 192 ++++++++++++++++++++++++++++++++++++++++++
hw/vfio/kvm-spapr.c | 47 +++++++++++
hw/vfio/kvm-stubs.c | 34 ++++++++
hw/vfio/listener.c | 4 -
hw/vfio/pci-quirks.c | 5 --
hw/vfio/pci.c | 39 +++------
hw/vfio/region.c | 5 ++
hw/vfio/spapr.c | 30 +------
hw/vfio-user/trace-events | 23 ++---
hw/vfio/meson.build | 6 +-
32 files changed, 580 insertions(+), 385 deletions(-)
create mode 100644 hw/vfio/kvm-spapr.h
create mode 100644 hw/vfio/igd-stubs.c
create mode 100644 hw/vfio/kvm-helpers.c
create mode 100644 hw/vfio/kvm-spapr.c
create mode 100644 hw/vfio/kvm-stubs.c