diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-07 15:06:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-07 15:06:42 +0100 |
| commit | b55a69fe5f0a504dac6359bb7e99a72b130c3661 (patch) | |
| tree | e9c0896f1aa5baf5336f98cd363777079a8a0656 /block/gluster.c | |
| parent | 0db1851becbefe3e50cfc03776fb1f75817376af (diff) | |
| parent | eefff991d059d299b917627d2a95bce34d2f97f3 (diff) | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170607' into staging
migration/next for 20170607
# gpg: Signature made Wed 07 Jun 2017 10:02:01 BST
# gpg: using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/migration/20170607:
qemu/migration: fix the double free problem on from_src_file
ram: Make RAMState dynamic
ram: Use MigrationStats for statistics
ram: Move ZERO_TARGET_PAGE inside XBZRLE
ram: Call migration_page_queue_free() at ram_migration_cleanup()
ram: We only print throttling information sometimes
ram: Unfold get_xbzrle_cache_stats() into populate_ram_info()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/gluster.c')
0 files changed, 0 insertions, 0 deletions