Failed in applying to current master (
apply log)
Maintainers: Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Alex Williamson <alex.williamson@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.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>, 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>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
docs/devel/migration.rst | 18 ++++++------
docs/devel/vfio-migration.rst | 4 +--
include/migration/register.h | 29 ++++++++++---------
migration/savevm.h | 8 +++---
hw/s390x/s390-stattrib.c | 11 ++++---
hw/vfio/migration.c | 17 +++++------
migration/block-dirty-bitmap.c | 14 ++++-----
migration/block.c | 17 ++++++-----
migration/migration.c | 52 ++++++++++++++++++++++------------
migration/ram.c | 35 ++++++++++++++++-------
migration/savevm.c | 37 +++++++++++++++++-------
tests/qtest/migration-test.c | 3 +-
hw/vfio/trace-events | 2 +-
migration/trace-events | 7 +++--
14 files changed, 148 insertions(+), 106 deletions(-)