From: Peter Maydell Date: Thu, 20 Nov 2014 13:00:28 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/amit-migration/tags/for-2.2-2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f75ad80f6c8ce0d83224076bd3445c77451977d5;p=qemu.git Merge remote-tracking branch 'remotes/amit-migration/tags/for-2.2-2' into staging Fix from a while back that unfortunately got ignored. Dave Gilbert says it may actually fix a case where autoconverge would break on a repeat migration (and not just fix stats). # gpg: Signature made Thu 20 Nov 2014 12:52:41 GMT using RSA key ID 854083B6 # gpg: Good signature from "Amit Shah " # gpg: aka "Amit Shah " # gpg: aka "Amit Shah " * remotes/amit-migration/tags/for-2.2-2: migration: static variables will not be reset at second migration Signed-off-by: Peter Maydell --- f75ad80f6c8ce0d83224076bd3445c77451977d5