Hi Anthony
please pull the migraiton queue, it includes:
v2:
- rebased (althought there was zero conflicts)
- moved to github (I was not having troubles with repo.or.cz, though)
v1:
- paolo cleanup & remove buffering series (already reviewed upstream)
- v2 of XBZRLE fixes from Orit
Thanks, Juan
The following changes since commit fa3889162ff724d09eb6b6bd06ba54769100a77f:
Merge remote-tracking branch 'origin/master' into staging (2013-03-10
20:39:17 -0500)
are available in the git repository at:
g...@github.com:juanquintela/qemu.git migration.next
for you to fetch changes up to ee0b44aa9d9450e873a761ca2030b2fa3ec52eb0:
page_cache: dup memory on insert (2013-03-11 13:32:03 +0100)
----------------------------------------------------------------
Juan Quintela (1):
Rename buffered_ to migration_
Kazuya Saito (1):
migration: add migrate_set_state tracepoint
Orit Wasserman (2):
Fix page_cache leak in cache_resize
Fix cache_resize to keep old entry age
Paolo Bonzini (40):
migration: simplify while loop
migration: always use vm_stop_force_state
migration: move more error handling to migrate_fd_cleanup
migration: push qemu_savevm_state_cancel out of qemu_savevm_state_*
block-migration: remove useless calls to blk_mig_cleanup
qemu-file: pass errno from qemu_fflush via f->last_error
migration: use qemu_file_set_error to pass error codes back to
qemu_savevm_state
qemu-file: temporarily expose qemu_file_set_error and qemu_fflush
migration: flush all data to fd when buffered_flush is called
migration: use qemu_file_set_error
migration: simplify error handling
migration: do not nest flushing of device data
migration: prepare to access s->state outside critical sections
migration: cleanup migration (including thread) in the iothread
block-migration: remove variables that are never read
block-migration: small preparatory changes for locking
block-migration: document usage of state across threads
block-migration: add lock
migration: reorder SaveVMHandlers members
migration: run pending/iterate callbacks out of big lock
migration: run setup callbacks out of big lock
migration: yay, buffering is gone
qemu-file: make qemu_fflush and qemu_file_set_error private again
migration: eliminate last_round
migration: detect error before sleeping
migration: remove useless qemu_file_get_error check
migration: use qemu_file_rate_limit consistently
migration: merge qemu_popen_cmd with qemu_popen
qemu-file: fsync a writable stdio QEMUFile
qemu-file: check exit status when closing a pipe QEMUFile
qemu-file: add writable socket QEMUFile
qemu-file: simplify and export qemu_ftell
migration: use QEMUFile for migration channel lifetime
migration: use QEMUFile for writing outgoing migration data
migration: use qemu_ftell to compute bandwidth
migration: small changes around rate-limiting
migration: move rate limiting to QEMUFile
migration: move contents of migration_close to migrate_fd_cleanup
migration: eliminate s->migration_file
migration: inline migrate_fd_close
Peter Lieven (2):
page_cache: fix memory leak
page_cache: dup memory on insert
arch_init.c | 17 +-
block-migration.c | 167 +++++++++++++------
docs/migration.txt | 20 +--
include/migration/migration.h | 12 +-
include/migration/page_cache.h | 3 +-
include/migration/qemu-file.h | 21 +--
include/migration/vmstate.h | 21 ++-
include/qemu/atomic.h | 1 +
include/qemu/osdep.h | 7 +
include/sysemu/sysemu.h | 6 +-
migration-exec.c | 39 +----
migration-fd.c | 47 +-----
migration-tcp.c | 33 +---
migration-unix.c | 33 +---
migration.c | 357 +++++++++--------------------------------
page_cache.c | 25 +--
savevm.c | 214 +++++++++++++-----------
trace-events | 3 +
18 files changed, 402 insertions(+), 624 deletions(-)
