The following changes since commit 2dfe7d07e2f40adb18a0b0cd286f3d327692d0fc:
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150316' into staging (2015-03-16 11:44:55 +0000) are available in the git repository at: git://github.com/juanquintela/qemu.git tags/migration/20150316 for you to fetch changes up to 54ed388b29794ab08089f1b5c7b0a03d075c3b5d: pc: Disable vmdesc submission for old machines (2015-03-16 14:35:37 +0100) This integrateds three series: - migrtion:defer by David - VMDESC fixes by Alexander - Bytes to pages by me PAssed all test by virt-test, and it fixes the problew with VMDESC detected by virt-test. Please apply. ---------------------------------------------------------------- migration/next for 20150316 ---------------------------------------------------------------- Alexander Graf (3): migration: Read JSON VM description on incoming migration migration: Allow to suppress vmdesc submission pc: Disable vmdesc submission for old machines Dr. David Alan Gilbert (2): Add -incoming defer Add migrate_incoming Juan Quintela (6): ram: make all save_page functions take a uint64_t parameter ram_find_and_save_block: change calling convention ram_save_page: change calling covention save_xbzrle_page: change calling convention save_block_hdr: we can recalculate the cont parameter here rename save_block_hdr to save_page_header arch_init.c | 177 ++++++++++++++++++++++++++---------------- hmp-commands.hx | 16 ++++ hmp.c | 14 ++++ hmp.h | 1 + hw/core/machine.c | 20 +++++ hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + include/hw/boards.h | 1 + include/migration/migration.h | 2 +- include/migration/qemu-file.h | 2 +- migration/migration.c | 48 ++++++++++-- migration/qemu-file.c | 3 +- migration/rdma.c | 2 +- qapi-schema.json | 15 ++++ qemu-options.hx | 3 +- qmp-commands.hx | 31 +++++++- savevm.c | 36 ++++++++- 17 files changed, 290 insertions(+), 83 deletions(-)