Failed in applying to current master (
apply log)
Maintainers: Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, John Snow <jsnow@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Dmitry Osipenko <dmitry.osipenko@collabora.com>, "Michael S. Tsirkin" <mst@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Nicholas Piggin <npiggin@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Gautam Menghani <gautam@linux.ibm.com>, Glenn Miles <milesg@linux.ibm.com>, Stefan Weil <sw@weilnetz.de>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Farhan Ali <alifm@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Thomas Huth <thuth@redhat.com>, Mark Kanda <mark.kanda@oracle.com>, Ben Chaney <bchaney@akamai.com>, Peter Maydell <peter.maydell@linaro.org>, Chinmay Rath <rathc@linux.ibm.com>
docs/devel/migration/main.rst | 2 +-
hw/block/fdc.c | 2 +-
hw/display/qxl.c | 4 +-
hw/display/vga.c | 2 +-
hw/display/virtio-gpu.c | 2 +-
hw/display/vmware_vga.c | 2 +-
hw/i386/vmmouse.c | 2 +-
hw/ide/ahci.c | 2 +-
hw/intc/openpic.c | 2 +-
hw/intc/spapr_xive.c | 2 +-
hw/intc/xics.c | 2 +-
hw/intc/xive.c | 2 +-
hw/nvram/eeprom93xx.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pcie_aer.c | 2 +-
hw/ppc/spapr_iommu.c | 2 +-
hw/ppc/spapr_pci.c | 7 +-
hw/ppc/spapr_vio.c | 4 +-
hw/s390x/css.c | 15 +-
hw/usb/hcd-uhci.c | 2 +-
include/migration/cpr.h | 2 +-
include/migration/vmstate.h | 73 ++--
migration/cpr.c | 22 +-
migration/savevm.c | 108 +++---
migration/trace-events | 30 +-
migration/vmstate-types.c | 642 +++++++++++++++++-----------------
migration/vmstate.c | 354 +++++++++++--------
target/arm/machine.c | 4 +-
target/ppc/machine.c | 6 +-
29 files changed, 691 insertions(+), 612 deletions(-)