From: Peter Maydell Date: Mon, 16 Mar 2015 14:45:09 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150316' into... X-Git-Tag: v2.3.0-rc0~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc68d2e5128284c8beb98b1c5b0331a0ed9f3197;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150316' into staging migration/next for 20150316 # gpg: Signature made Mon Mar 16 13:36:37 2015 GMT using RSA key ID 5872D723 # gpg: Can't check signature: public key not found * remotes/juanquintela/tags/migration/20150316: pc: Disable vmdesc submission for old machines migration: Allow to suppress vmdesc submission migration: Read JSON VM description on incoming migration rename save_block_hdr to save_page_header save_block_hdr: we can recalculate the cont parameter here save_xbzrle_page: change calling convention ram_save_page: change calling covention ram_find_and_save_block: change calling convention ram: make all save_page functions take a uint64_t parameter Add migrate_incoming Add -incoming defer Signed-off-by: Peter Maydell --- bc68d2e5128284c8beb98b1c5b0331a0ed9f3197