Hi This pull request contain the RDMA migration fixes frmo Dave and migration properties changes by Peter.
Please apply, Juan. The following changes since commit e9277a19a1a50ab5662c16795531bac332f142f9: Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2017-07-17-v2-tag' into staging (2017-07-18 14:14:32 +0100) are available in the git repository at: git://github.com/juanquintela/qemu.git tags/migration/20170718 for you to fetch changes up to 6b19a7d91c8de9904c67b87203a46e55db4181ab: migration: check global caps for validity (2017-07-18 17:36:26 +0200) ---------------------------------------------------------------- migration/next for 20170718 ---------------------------------------------------------------- Dr. David Alan Gilbert (6): migration/rdma: Fix race on source migration: Close file on failed migration load migration/rdma: fix qemu_rdma_block_for_wrid error paths migration/rdma: Allow cancelling while waiting for wrid migration/rdma: Safely convert control types migration/rdma: Send error during cancelling Peter Xu (10): qdev: provide DEFINE_PROP_INT64() migration: export parameters to props migration: export capabilities to props migration: introduce migrate_params_check() migration: provide migrate_params_apply() migration: check global params for validity migration: remove check against colo support migration: provide migrate_caps_check() migration: provide migrate_cap_add() migration: check global caps for validity hw/core/qdev-properties.c | 32 ++++++ include/hw/qdev-properties.h | 3 + include/migration/colo.h | 1 - migration/colo.c | 5 - migration/migration.c | 268 +++++++++++++++++++++++++++++++++---------- migration/rdma.c | 137 ++++++++++++++++------ 6 files changed, 343 insertions(+), 103 deletions(-)