Failed in applying to current master (
apply log)
hmp.c | 13 ++
migration/migration.c | 17 ++-
migration/ram.c | 133 ++++++++++++++-------
migration/ram.h | 1 +
migration/rdma.c | 2 +-
migration/savevm.c | 7 +-
qapi/migration.json | 26 +++-
tests/migration-test.c | 36 +++---
tests/migration/Makefile | 35 ++++++
tests/migration/i386/Makefile | 22 ++++
.../{x86-a-b-bootblock.s => i386/a-b-bootblock.S} | 4 -
.../{x86-a-b-bootblock.h => i386/a-b-bootblock.h} | 8 +-
tests/migration/migration-test.h | 21 ++++
tests/migration/rebuild-x86-bootblock.sh | 33 -----
vl.c | 1 +
15 files changed, 258 insertions(+), 101 deletions(-)
create mode 100644 tests/migration/Makefile
create mode 100644 tests/migration/i386/Makefile
rename tests/migration/{x86-a-b-bootblock.s => i386/a-b-bootblock.S} (93%)
rename tests/migration/{x86-a-b-bootblock.h => i386/a-b-bootblock.h} (92%)
create mode 100644 tests/migration/migration-test.h
delete mode 100755 tests/migration/rebuild-x86-bootblock.sh