Failed in applying to current master (
apply log)
Maintainers: 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>, Ilya Leoshkevich <iii@linux.ibm.com>, Alex Williamson <alex.williamson@redhat.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@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>
include/migration/register.h | 30 +++++++++++++++---------------
migration/qemu-file.h | 1 +
migration/savevm.h | 10 ++++------
hw/s390x/s390-stattrib.c | 8 +++-----
hw/vfio/migration.c | 11 ++++-------
migration/block-dirty-bitmap.c | 7 +++----
migration/block.c | 20 ++++----------------
migration/migration.c | 20 +++++++++-----------
migration/qemu-file.c | 34 ++++++++++++++++++++++++++++++++++
migration/ram.c | 20 ++++++++------------
migration/savevm.c | 28 ++++++++++------------------
hw/vfio/trace-events | 2 +-
migration/trace-events | 5 +++--
13 files changed, 99 insertions(+), 97 deletions(-)