Failed in applying to current master (
apply log)
Maintainers: Stefan Berger <stefanb@linux.vnet.ibm.com>, Gerd Hoffmann <kraxel@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Leonardo Bras <leobras@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>
backends/tpm/tpm_emulator.c | 2 +-
hw/usb/hcd-ehci.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/xen/xen-hvm-common.c | 2 +-
include/migration/snapshot.h | 7 ++
include/sysemu/runstate.h | 20 ++++
migration/global_state.c | 47 +++++----
migration/migration-hmp-cmds.c | 8 +-
migration/migration.c | 15 +--
migration/savevm.c | 23 +++--
qapi/misc.json | 11 ++-
qapi/run-state.json | 6 +-
system/cpus.c | 47 +++++++--
system/runstate.c | 9 ++
system/vl.c | 2 +
tests/migration/i386/Makefile | 5 +-
tests/migration/i386/a-b-bootblock.S | 50 +++++++++-
tests/migration/i386/a-b-bootblock.h | 26 +++--
tests/qtest/migration-helpers.c | 27 ++----
tests/qtest/migration-helpers.h | 11 ++-
tests/qtest/migration-test.c | 181 +++++++++++++++++++++++++----------
21 files changed, 356 insertions(+), 147 deletions(-)