From: Peter Maydell Date: Tue, 17 Mar 2015 17:11:33 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150317' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d8e33fc98081b548b25be9458490c40858480344;p=qemu.git Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150317' into staging migration/next for 20150317 # gpg: Signature made Tue Mar 17 14:21:14 2015 GMT using RSA key ID 5872D723 # gpg: Can't check signature: public key not found * remotes/juanquintela/tags/migration/20150317: migration: Expose 'cancelling' status to user migration: Convert 'status' of MigrationInfo to use an enum type hmp: Rename 'MigrationStatus' to 'HMPMigrationStatus' migration: Rename abbreviated macro MIG_STATE_* to MIGRATION_STATUS_* migration: Remove unused functions arch_init: Count the total number of pages by using helper function migrate_incoming: Cleanup/clarify error messages Warn against the use of the string as uri parameter to migrate-incoming migrate_incoming: use hmp_handle_error migration: Fix remaining 32 bit compiler errors migration: Fix some 32 bit compiler errors migration/rdma: clean up qemu_rdma_dest_init a bit migration: Avoid qerror_report_err() outside QMP command handlers Signed-off-by: Peter Maydell --- d8e33fc98081b548b25be9458490c40858480344