diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-14 13:51:21 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-14 13:51:21 +0000 |
| commit | 0dcee62261cb044339b10e4bda1f67ef7dc82803 (patch) | |
| tree | c04801726df60da67fb2fa4f8a52a07fbabbc94d /qemu-img.c | |
| parent | 8326ec2c834f7debbba0ed80a433c3ae0cf48289 (diff) | |
| parent | 32c3db5b26a1001dbe0763bdf72fdc8017c6b7b8 (diff) | |
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-7' into staging
migration:
- postcopy is no longer experimental
- fix a use-after-free in postcopy
- fix a compile warning
# gpg: Signature made Fri 11 Mar 2016 12:29:33 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/migration-for-2.6-7:
postcopy: Remove the x-
postcopy: listen thread is never joined
migration: fix use-after-free in loadvm_postcopy_handle_run_bh
migration: fix warning for source_return_path_thread
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
0 files changed, 0 insertions, 0 deletions