Hi This pull request: - drop block capability patch (now they is being reviewed) - add following patches that got reviewed: * page_cache.c into migration * postcopy stuff into postocpy-ram.c * check_migratable change
Please apply. Thanks, Juan. The following changes since commit cdece0467c00007cf8e3f4b3c3f0b13bf2c4fea9: block/win32: fix 'ret not initialized' warning (2017-05-16 15:34:18 +0100) are available in the git repository at: git://github.com/juanquintela/qemu.git tags/migration/20170517 for you to fetch changes up to 1bfe5f0586083747f1602931713111673849cd9d: migration: Move check_migratable() into qdev.c (2017-05-17 12:04:59 +0200) ---------------------------------------------------------------- migration/next for 20170517 ---------------------------------------------------------------- Juan Quintela (7): migration: Fix regression with compression threads migration: Pass Error ** argument to {save,load}_vmstate ram: Rename RAM_SAVE_FLAG_COMPRESS to RAM_SAVE_FLAG_ZERO migration: Create migration/blocker.h migration: Move page_cache.c to migration/ migration: Move postcopy stuff to postcopy-ram.c migration: Move check_migratable() into qdev.c Makefile.objs | 1 - block/qcow.c | 2 +- block/vdi.c | 2 +- block/vhdx.c | 2 +- block/vmdk.c | 2 +- block/vpc.c | 2 +- block/vvfat.c | 2 +- hmp.c | 9 +++- hw/9pfs/9p.c | 2 +- hw/core/qdev.c | 20 +++++++-- hw/display/qxl.c | 2 +- hw/display/virtio-gpu.c | 2 +- hw/intc/arm_gic_kvm.c | 2 +- hw/intc/arm_gicv3_its_kvm.c | 2 +- hw/intc/arm_gicv3_kvm.c | 2 +- hw/misc/ivshmem.c | 2 +- hw/scsi/vhost-scsi.c | 2 +- hw/virtio/vhost.c | 2 +- include/migration/blocker.h | 35 +++++++++++++++ include/migration/migration.h | 50 ---------------------- include/migration/vmstate.h | 2 + include/sysemu/sysemu.h | 6 +-- migration/Makefile.objs | 2 +- migration/migration.c | 34 +-------------- page_cache.c => migration/page_cache.c | 0 {include/migration => migration}/page_cache.h | 0 migration/postcopy-ram.c | 18 ++++++++ migration/postcopy-ram.h | 26 ++++++++++++ migration/ram.c | 35 +++++++++------ migration/savevm.c | 61 +++++++++++++++------------ replay/replay-snapshot.c | 8 +++- stubs/migr-blocker.c | 2 +- stubs/vmstate.c | 5 +-- target/i386/kvm.c | 2 +- tests/Makefile.include | 2 +- vl.c | 4 +- 36 files changed, 194 insertions(+), 158 deletions(-) create mode 100644 include/migration/blocker.h rename page_cache.c => migration/page_cache.c (100%) rename {include/migration => migration}/page_cache.h (100%)