From: Peter Maydell Date: Wed, 26 Feb 2014 22:31:10 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140225' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f6831f61a44fde832ee6fab0cc5632de34cf6b7;p=qemu.git Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140225' into staging migration/next for 20140225 # gpg: Signature made Tue 25 Feb 2014 14:04:31 GMT using RSA key ID 5872D723 # gpg: Can't check signature: public key not found * remotes/juanquintela/tags/migration/20140225: rdma: rename 'x-rdma' => 'rdma' Fix two XBZRLE corruption issues Fix vmstate_info_int32_le comparison/assign qemu_file: use fwrite() correctly Signed-off-by: Peter Maydell --- 6f6831f61a44fde832ee6fab0cc5632de34cf6b7