Failed in applying to current master (
apply log)
Maintainers: Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Mark Kanda <mark.kanda@oracle.com>, Ben Chaney <bchaney@akamai.com>, Li Zhijian <lizhijian@fujitsu.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
docs/about/deprecated.rst | 33 --
docs/about/removed-features.rst | 30 ++
include/migration/cpr.h | 5 +
migration/channel.c | 374 ++++++++++++++--
migration/channel.h | 27 +-
migration/cpr-exec.c | 2 +-
migration/cpr-transfer.c | 23 +
migration/exec.c | 11 +-
migration/exec.h | 8 +-
migration/fd.c | 26 +-
migration/fd.h | 9 +-
migration/file.c | 20 +-
migration/file.h | 7 +-
migration/meson.build | 1 -
migration/migration-hmp-cmds.c | 2 +-
migration/migration.c | 570 ++++++-------------------
migration/migration.h | 15 +-
migration/multifd.c | 22 +-
migration/multifd.h | 2 +-
migration/options.c | 10 +-
migration/postcopy-ram.c | 2 +-
migration/qemu-file.c | 41 +-
migration/qemu-file.h | 2 +-
migration/rdma.c | 46 +-
migration/rdma.h | 6 +-
migration/socket.c | 30 +-
migration/socket.h | 6 +-
migration/threadinfo.c | 64 ---
migration/threadinfo.h | 25 --
migration/tls.c | 33 +-
migration/tls.h | 9 +-
migration/trace-events | 20 +-
migration/vmstate-types.c | 5 +-
qapi/migration.json | 50 ---
tests/qtest/migration/framework.c | 25 +-
tests/qtest/migration/framework.h | 7 +-
tests/qtest/migration/postcopy-tests.c | 12 +-
tests/qtest/migration/precopy-tests.c | 41 --
tests/qtest/migration/tls-tests.c | 8 +-
39 files changed, 734 insertions(+), 895 deletions(-)
delete mode 100644 migration/threadinfo.c
delete mode 100644 migration/threadinfo.h