The following changes since commit 5a4992834daec85c3913654903fb9f4f954e585a:
Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-03-17'
into staging (2015-03-17 11:43:00 +0000)
are available in the git repository at:
git://github.com/juanquintela/qemu.git tags/migration/20150317
for you to fetch changes up to cde63fbed86e20dda98bf35025faedd994918f00:
migration: Expose 'cancelling' status to user (2015-03-17 15:20:37 +0100)
----------------------------------------------------------------
migration/next for 20150317
Hi Peter
Please apply:
- RDMA small fixes (Tokared & Stefan)
- remove unused functions (thomas)
- minor fixes for migration_incoming (dave)
- use qerror correctly (Markus)
- Move migration status to one ENUM. Libvirt ack'd the patch (Zhanghailiang)
Thanks, Juan.
----------------------------------------------------------------
Dr. David Alan Gilbert (3):
migrate_incoming: use hmp_handle_error
Warn against the use of the string as uri parameter to migrate-incoming
migrate_incoming: Cleanup/clarify error messages
Markus Armbruster (1):
migration: Avoid qerror_report_err() outside QMP command handlers
Michael Tokarev (1):
migration/rdma: clean up qemu_rdma_dest_init a bit
Stefan Weil (2):
migration: Fix some 32 bit compiler errors
migration: Fix remaining 32 bit compiler errors
Thomas Huth (1):
migration: Remove unused functions
zhanghailiang (5):
arch_init: Count the total number of pages by using helper function
migration: Rename abbreviated macro MIG_STATE_* to MIGRATION_STATUS_*
hmp: Rename 'MigrationStatus' to 'HMPMigrationStatus'
migration: Convert 'status' of MigrationInfo to use an enum type
migration: Expose 'cancelling' status to user
arch_init.c | 8 +--
hmp.c | 21 +++----
include/migration/migration.h | 1 -
include/migration/qemu-file.h | 1 -
migration/migration.c | 115 +++++++++++++++++---------------------
migration/qemu-file-buf.c | 31 -----------
migration/rdma.c | 127 +++++++++++++++++++++---------------------
qapi-schema.json | 37 ++++++++++--
8 files changed, 155 insertions(+), 186 deletions(-)
