Failed in applying to current master (
apply log)
Maintainers: Peter Maydell <peter.maydell@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Mark Kanda <mark.kanda@oracle.com>, Ben Chaney <bchaney@akamai.com>, Alex Williamson <alex@shazbot.org>, "Cédric Le Goater" <clg@redhat.com>, Hailiang Zhang <zhanghailiang@xfusion.com>, Markus Armbruster <armbru@redhat.com>, Stefano Garzarella <sgarzare@redhat.com>, Laurent Vivier <lvivier@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>
hw/intc/arm_gicv3_kvm.c | 2 +-
hw/net/virtio-net.c | 4 +-
hw/scsi/scsi-disk.c | 4 +-
hw/vfio/cpr-legacy.c | 2 +-
hw/vfio/cpr.c | 8 +-
hw/vfio/migration.c | 4 +-
include/migration/misc.h | 20 +-
migration/colo.c | 16 +-
migration/cpr-exec.c | 6 +-
migration/cpr.c | 2 +-
migration/migration.c | 86 ++++----
migration/savevm.c | 320 ++++++++++++++++--------------
migration/savevm.h | 18 +-
migration/trace-events | 1 +
monitor/qmp-cmds.c | 3 +
net/vhost-vdpa.c | 4 +-
tests/qtest/migration/tls-tests.c | 8 +-
ui/spice-core.c | 7 +-
18 files changed, 280 insertions(+), 235 deletions(-)