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>, Alex Williamson <alex@shazbot.org>, "Cédric Le Goater" <clg@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>, John Levon <john.levon@nutanix.com>, Thanos Makatos <thanos.makatos@nutanix.com>, "Philippe Mathieu-Daudé" <philmd@mailo.com>, Zhao Liu <zhao1.liu@intel.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@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>, Richard Henderson <richard.henderson@linaro.org>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, John Snow <jsnow@redhat.com>, Lukas Straub <lukasstraub2@web.de>, Markus Armbruster <armbru@redhat.com>
docs/devel/migration/vfio.rst | 17 +++-
docs/interop/vfio-user.rst | 82 +++++++++------
qapi/migration.json | 16 ++-
hw/vfio/pci.h | 1 +
hw/vfio/vfio-migration-internal.h | 2 +
include/hw/vfio/vfio-container.h | 15 ---
include/migration/client-options.h | 1 +
include/migration/misc.h | 2 +
include/migration/register.h | 56 +++++-----
include/system/host_iommu_device.h | 9 ++
migration/migration.h | 34 ++++++-
migration/savevm.h | 11 +-
backends/iommufd.c | 8 ++
hw/core/machine.c | 1 +
hw/s390x/s390-stattrib.c | 2 +-
hw/vfio-user/proxy.c | 21 ++--
hw/vfio/container.c | 38 -------
hw/vfio/iommufd.c | 50 ++++++---
hw/vfio/listener.c | 5 +-
hw/vfio/migration.c | 204 +++++++++++++++++++++++++++++--------
hw/vfio/pci.c | 137 +++++++++++++++++++++----
migration/block-dirty-bitmap.c | 11 +-
migration/colo.c | 14 +++
migration/migration.c | 98 ++++++++++++------
migration/options.c | 9 ++
migration/ram.c | 40 ++++----
migration/savevm.c | 195 ++++++++++++++++++++++-------------
backends/trace-events | 2 +-
hw/vfio/trace-events | 7 +-
migration/trace-events | 9 +-
30 files changed, 753 insertions(+), 344 deletions(-)