Failed in applying to current master (
apply log)
crypto/tlssession.c | 96 ++++++----
hw/core/machine.c | 1 +
hw/remote/mpqemu-link.c | 2 +-
include/crypto/tlssession.h | 46 +++--
include/io/channel-tls.h | 12 ++
include/io/channel.h | 3 +
io/channel-tls.c | 92 ++++++++-
io/channel.c | 9 +-
io/trace-events | 5 +
migration/channel.c | 9 +-
migration/cpr.c | 1 +
migration/migration.c | 81 ++++----
migration/migration.h | 37 +++-
migration/multifd.c | 54 +++++-
migration/multifd.h | 2 +
migration/options.c | 2 +
migration/ram.c | 4 +-
migration/rdma.c | 2 +-
migration/savevm.c | 6 +-
migration/tls.c | 5 +
migration/tls.h | 2 +-
migration/trace-events | 4 +-
qapi/migration.json | 4 +-
.../migration-stress/guestperf/comparison.py | 15 +-
tests/migration-stress/guestperf/engine.py | 43 ++++-
tests/migration-stress/guestperf/report.py | 20 ++
tests/migration-stress/guestperf/scenario.py | 7 +-
tests/migration-stress/guestperf/shell.py | 3 +
tests/qtest/migration/migration-util.c | 24 +++
tests/qtest/migration/migration-util.h | 2 +
tests/qtest/migration/precopy-tests.c | 176 ++++++++++++++++++
tests/unit/test-crypto-tlssession.c | 12 +-
32 files changed, 651 insertions(+), 130 deletions(-)