Failed in applying to current master (
apply log)
Maintainers: Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Laurent Vivier <lvivier@redhat.com>
docs/about/deprecated.rst | 12 +
migration/migration-hmp-cmds.c | 490 ++++++++---
migration/migration.c | 49 +-
migration/migration.h | 14 +-
migration/options.c | 1154 ++++++++++++-------------
migration/options.h | 30 +-
migration/page_cache.c | 6 +-
migration/ram.c | 5 +-
migration/savevm.c | 8 +-
migration/tls.c | 2 +-
qapi/migration.json | 558 ++++--------
qapi/pragma.json | 1 +
system/vl.c | 3 +-
tests/qtest/migration/file-tests.c | 68 +-
tests/qtest/migration/framework.c | 50 +-
tests/qtest/migration/framework.h | 1 +
tests/qtest/migration/migration-qmp.c | 30 +-
tests/qtest/migration/migration-qmp.h | 4 +-
tests/qtest/migration/misc-tests.c | 4 +-
tests/qtest/migration/precopy-tests.c | 23 +-
20 files changed, 1315 insertions(+), 1197 deletions(-)