diff options
author | Peter Maydell | 2015-11-05 11:10:57 +0100 |
---|---|---|
committer | Peter Maydell | 2015-11-05 11:10:57 +0100 |
commit | 6c5f30cad290c745f910481d0e890b3f4fad1f00 (patch) | |
tree | 227ffd08b40aba8f7f64a4266b38ca15f8d22d8e /hw/usb/libhw.c | |
parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-11-03' into... (diff) | |
parent | migration: fix analyze-migration.py script (diff) | |
download | qemu-6c5f30cad290c745f910481d0e890b3f4fad1f00.tar.gz qemu-6c5f30cad290c745f910481d0e890b3f4fad1f00.tar.xz qemu-6c5f30cad290c745f910481d0e890b3f4fad1f00.zip |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151104' into staging
migration/next for 20151104
# gpg: Signature made Wed 04 Nov 2015 12:45:19 GMT using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
* remotes/juanquintela/tags/migration/20151104:
migration: fix analyze-migration.py script
migration: code clean up
migration: rename cancel to cleanup in SaveVMHandles
migration: rename qemu_savevm_state_cancel
migration: defer migration_end & blk_mig_cleanup
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/libhw.c')
0 files changed, 0 insertions, 0 deletions