Failed in applying to current master (
apply log)
Maintainers: Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, John Snow <jsnow@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>
hw/core/machine.c | 4 +-
include/qemu/stats64.h | 6 +
migration/block-dirty-bitmap.c | 14 +-
migration/migration.c | 220 +-----------------
migration/migration.h | 11 +
migration/multifd.c | 3 +-
migration/options.c | 404 +++++++++++++++++++++++----------
migration/options.h | 19 ++
migration/ram.c | 51 ++++-
migration/ram.h | 4 +-
migration/tls.c | 19 +-
util/stats64.c | 11 +
12 files changed, 414 insertions(+), 352 deletions(-)