Failed in applying to current master (
apply log)
Maintainers: Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Leonardo Bras <leobras@redhat.com>, Li Zhijian <lizhijian@fujitsu.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>
migration/exec.c | 74 ++++++++----
migration/exec.h | 8 +-
migration/file.c | 24 ++--
migration/file.h | 10 +-
migration/migration-hmp-cmds.c | 27 ++++-
migration/migration.c | 204 ++++++++++++++++++++++++++-------
migration/migration.h | 3 +-
migration/rdma.c | 33 ++----
migration/rdma.h | 6 +-
migration/socket.c | 39 ++-----
migration/socket.h | 7 +-
qapi/migration.json | 174 +++++++++++++++++++++++++++-
system/vl.c | 2 +-
tests/qtest/migration-test.c | 7 +-
14 files changed, 468 insertions(+), 150 deletions(-)