tree 6e1d1204a3a9b939a7b1badbf7749fd8fe896efa
parent 3988982c82ad4173dea376fea30e5432d36146db
parent 9781c3716a4b529a2af64502926a57c11e69e6ca
author Anthony Liguori <aliguori@us.ibm.com> 1374595043 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1374595043 -0500

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 <aliguori@us.ibm.com>