Failed in applying to current master (
apply log)
Maintainers: Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
docs/about/deprecated.rst | 10 ++++
docs/devel/migration.rst | 94 ++++++++++++++++++++++----------
qapi/migration.json | 87 ++++++++++++++++++++++++++----
include/sysemu/dirtylimit.h | 2 +
migration/options.h | 1 +
migration/qemu-file.h | 14 ++---
migration/threadinfo.h | 7 +--
migration/migration-hmp-cmds.c | 26 +++++++++
migration/migration.c | 36 +++++++++----
migration/multifd.c | 4 +-
migration/options.c | 87 +++++++++++++++++++++++++++++-
migration/qemu-file.c | 24 ++-------
migration/ram.c | 59 +++++++++++++++++----
migration/rdma.c | 39 +++++++-------
migration/savevm.c | 6 +--
migration/threadinfo.c | 19 +++++--
migration/vmstate.c | 4 +-
softmmu/dirtylimit.c | 97 ++++++++++++++++++++++++++++++----
tests/qtest/migration-test.c | 48 ++++++++---------
migration/trace-events | 1 +
20 files changed, 510 insertions(+), 155 deletions(-)