Failed in applying to current master (
apply log)
MAINTAINERS | 1 +
include/migration/register.h | 15 ++
migration/multifd.h | 5 +
migration/options.h | 1 +
migration/rdma.h | 3 +-
migration/savevm.h | 1 +
tests/qtest/migration/framework.h | 9 +-
migration/migration.c | 164 +++++++++++--------
migration/multifd.c | 5 -
migration/options.c | 30 ++++
migration/ram.c | 168 +++++++++++++++----
migration/rdma.c | 191 +---------------------
migration/savevm.c | 33 ++++
tests/qtest/migration/compression-tests.c | 22 ++-
tests/qtest/migration/cpr-tests.c | 6 +-
tests/qtest/migration/file-tests.c | 58 +++----
tests/qtest/migration/framework.c | 75 ++++++---
tests/qtest/migration/misc-tests.c | 4 +-
tests/qtest/migration/postcopy-tests.c | 8 +-
tests/qtest/migration/precopy-tests.c | 91 +++++++++--
tests/qtest/migration/tls-tests.c | 23 ++-
scripts/rdma-migration-helper.sh | 70 ++++++++
scripts/vmstate-static-checker.py | 1 +
23 files changed, 614 insertions(+), 370 deletions(-)
create mode 100755 scripts/rdma-migration-helper.sh