Failed in applying to current master (
apply log)
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Thomas Huth <thuth@redhat.com>, Yi Liu <yi.l.liu@intel.com>, Eric Auger <eric.auger@redhat.com>, Zhenzhong Duan <zhenzhong.duan@intel.com>, Steve Sistare <steven.sistare@oracle.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, John Levon <john.levon@nutanix.com>, Thanos Makatos <thanos.makatos@nutanix.com>, Alex Williamson <alex.williamson@redhat.com>, "Cédric Le Goater" <clg@redhat.com>, Tony Krowiak <akrowiak@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, David Hildenbrand <david@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>
docs/devel/migration/CPR.rst | 5 +-
Makefile | 1 +
qapi/migration.json | 6 +-
hw/vfio/pci.h | 2 +
include/exec/cpu-common.h | 1 +
include/hw/vfio/vfio-container-base.h | 15 +++
include/hw/vfio/vfio-cpr.h | 36 +++++-
include/hw/vfio/vfio-device.h | 3 +
include/migration/cpr.h | 14 +++
include/system/iommufd.h | 7 ++
include/system/kvm.h | 1 +
accel/kvm/kvm-all.c | 32 +++++
backends/iommufd.c | 107 +++++++++++++++-
hw/vfio-user/container.c | 11 +-
hw/vfio/ap.c | 4 +-
hw/vfio/ccw.c | 4 +-
hw/vfio/container-base.c | 9 ++
hw/vfio/cpr-iommufd.c | 225 ++++++++++++++++++++++++++++++++++
hw/vfio/cpr-legacy.c | 25 ++--
hw/vfio/cpr.c | 144 ++++++++++++++++++++--
hw/vfio/device.c | 40 ++++--
hw/vfio/helpers.c | 11 ++
hw/vfio/iommufd-stubs.c | 18 +++
hw/vfio/iommufd.c | 81 ++++++++++--
hw/vfio/pci.c | 109 +++++++++++++++-
hw/vfio/platform.c | 2 +-
migration/cpr.c | 52 ++++++--
system/physmem.c | 5 +
.b4-config | 1 -
backends/trace-events | 2 +
hw/i386/Kconfig | 2 +-
hw/vfio/meson.build | 2 +
hw/vfio/trace-events | 3 +
33 files changed, 888 insertions(+), 92 deletions(-)
create mode 100644 hw/vfio/cpr-iommufd.c
create mode 100644 hw/vfio/iommufd-stubs.c