From: Peter Maydell Date: Fri, 5 Feb 2016 14:20:46 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-2' into... X-Git-Tag: TizenStudio_2.0_p2.4~27^2~6^2~8^2~210 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-2' into staging Migration pull req. Small fixes, nothing major. # gpg: Signature made Fri 05 Feb 2016 13:51:30 GMT using RSA key ID 854083B6 # gpg: Good signature from "Amit Shah " # gpg: aka "Amit Shah " # gpg: aka "Amit Shah " * remotes/amit-migration/tags/migration-for-2.6-2: migration: fix bad string passed to error_report() static checker: e1000-82540em got aliased to e1000 migration: remove useless code. qmp-commands.hx: Document the missing options for migration capability commands qmp-commands.hx: Fix the missing options for migration parameters commands migration/ram: Fix some helper functions' parameter to use PageSearchStatus savevm: Split load vm state function qemu_loadvm_state migration: rename 'file' in MigrationState to 'to_dst_file' ram: Split host_from_stream_offset() into two helper functions Signed-off-by: Peter Maydell --- ee8e8f92a730afc17ab8be6e86df6b9a23b8ebc6