diff options
author | 2014-11-20 13:00:28 +0000 | |
---|---|---|
committer | 2014-11-20 13:00:28 +0000 | |
commit | f75ad80f6c8ce0d83224076bd3445c77451977d5 (patch) | |
tree | c8330e51c4044d2c1545d3274d3817423895b2fb /util/qemu-progress.c | |
parent | Update version for v2.2.0-rc2 release (diff) | |
parent | migration: static variables will not be reset at second migration (diff) | |
download | qemu-f75ad80f6c8ce0d83224076bd3445c77451977d5.tar.xz qemu-f75ad80f6c8ce0d83224076bd3445c77451977d5.zip |
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 <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/for-2.2-2:
migration: static variables will not be reset at second migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-progress.c')
0 files changed, 0 insertions, 0 deletions