From: Anthony Liguori Date: Tue, 23 Jul 2013 15:57:23 +0000 (-0500) Subject: Merge remote-tracking branch 'quintela/migration.next' into staging X-Git-Tag: v1.6.0-rc0~94 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f03d07d4683b2e8325a7cb60b4e14b977b1a869c;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'quintela/migration.next' into staging # By Michael R. Hines (8) and others # Via Juan Quintela * quintela/migration.next: migration: add autoconvergence documentation Fix real mode guest segments dpl value in savevm Fix real mode guest migration rdma: account for the time spent in MIG_STATE_SETUP through QMP rdma: introduce MIG_STATE_NONE and change MIG_STATE_SETUP state transition rdma: allow state transitions between other states besides ACTIVE rdma: send pc.ram rdma: core logic rdma: introduce ram_handle_compressed() rdma: bugfix: ram_control_save_page() rdma: update documentation to reflect new unpin support Message-id: 1374590725-14144-1-git-send-email-quintela@redhat.com Signed-off-by: Anthony Liguori --- f03d07d4683b2e8325a7cb60b4e14b977b1a869c