Hi In this pull requset: - I included the v1 of peter return path, fix it - fix the compliation with older compilers (new compliers don't complain about a repeated typedef, so I didn't noticed) - Add test for disabled features - Last bit of misc cleanup, remove of not needed includes
Please, apply. Thanks, Juan. The following changes since commit 3f0602927b120a480b35dcf58cf6f95435b3ae91: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170613' into staging (2017-06-13 15:49:07 +0100) are available in the git repository at: git://github.com/juanquintela/qemu.git tags/migration/20170614 for you to fetch changes up to 3416ab5bb452f1b6cea58aed8983ffb9a455b7c4: migration: Don't create decompression threads if not enabled (2017-06-14 11:11:06 +0200) ---------------------------------------------------------------- migration/next for 20170614 ---------------------------------------------------------------- Juan Quintela (4): migration: Fix compilation with older compilers migration: Remove unneeded includes migration: Test for disabled features on reception migration: Don't create decompression threads if not enabled Peter Xu (1): migration: fix incorrect enable return path include/migration/colo.h | 3 --- include/migration/misc.h | 2 ++ include/migration/register.h | 3 --- include/migration/vmstate.h | 1 - include/qemu/typedefs.h | 2 ++ migration/block.c | 6 ------ migration/colo-failover.c | 2 ++ migration/colo.c | 2 -- migration/exec.c | 2 -- migration/fd.c | 2 -- migration/global_state.c | 1 - migration/migration.c | 12 +++++------- migration/migration.h | 2 -- migration/postcopy-ram.c | 2 -- migration/qemu-file.c | 2 -- migration/ram.c | 24 +++++++++++++++++++----- migration/savevm.c | 6 ------ 17 files changed, 30 insertions(+), 44 deletions(-)