Failed in applying to current master (
apply log)
Maintainers: Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, John Snow <jsnow@redhat.com>
hw/ppc/spapr.c | 5 +-
hw/s390x/s390-stattrib.c | 2 +-
include/migration/qemu-file-types.h | 2 +-
migration/block-dirty-bitmap.c | 2 +-
migration/block.c | 9 ++--
migration/meson.build | 2 +-
migration/migration-stats.c | 56 ++++++++++++++++++++
migration/migration-stats.h | 59 +++++++++++++++++++++
migration/migration.c | 46 ++++++-----------
migration/migration.h | 1 -
migration/multifd.c | 14 ++---
migration/options.c | 7 ++-
migration/qemu-file.c | 79 +++++------------------------
migration/qemu-file.h | 43 ++++------------
migration/ram.c | 34 +++++++------
migration/rdma.c | 64 ++++++++++++-----------
migration/savevm.c | 27 +++++++---
migration/trace-events | 3 ++
migration/vmstate.c | 8 +--
19 files changed, 259 insertions(+), 204 deletions(-)