Failed in applying to current master (
apply log)
hmp.c | 7 ++++
include/exec/ramlist.h | 4 ++-
include/migration/vmstate.h | 2 --
include/qemu/typedefs.h | 1 +
migration/block-dirty-bitmap.c | 3 ++
migration/migration.c | 73 ++++++++++++++++++++++++++++++++++++++----
migration/migration.h | 11 +++++++
migration/qjson.h | 2 --
migration/ram.c | 53 ++++++++++++++++++++----------
migration/rdma.c | 2 +-
migration/trace-events | 2 ++
qapi/migration.json | 19 +++++++++--
12 files changed, 146 insertions(+), 33 deletions(-)