Failed in applying to current master (
apply log)
MAINTAINERS | 2 +-
docs/devel/vfio-migration.rst | 45 +++++--
qapi/migration.json | 12 +-
include/hw/vfio/vfio-common.h | 12 +-
include/migration/register.h | 2 +
migration/migration.h | 15 +++
migration/options.h | 1 +
migration/savevm.h | 1 +
hw/s390x/s390-pci-vfio.c | 37 +----
hw/vfio/common.c | 68 +++++++---
hw/vfio/migration.c | 305 ++++++++++++++++++++++++++++++++++++------
hw/vfio/pci-quirks.c | 41 +++++-
hw/vfio/pci.c | 15 ++-
migration/migration.c | 33 ++++-
migration/options.c | 17 +++
migration/savevm.c | 55 ++++++++
migration/target.c | 17 ++-
tests/qtest/migration-test.c | 31 +++++
hw/vfio/trace-events | 6 +-
migration/trace-events | 3 +
20 files changed, 600 insertions(+), 118 deletions(-)