Merge remote-tracking branch 'quintela/migration.next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Jul 2013 19:49:15 +0000 (14:49 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Jul 2013 19:49:16 +0000 (14:49 -0500)
# By Chegu Vinod
# Via Juan Quintela
* quintela/migration.next:
  Force auto-convegence of live migration
  Add 'auto-converge' migration capability
  Introduce async_run_on_cpu()

Message-id: 1373664508-5404-1-git-send-email-quintela@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
1  2 
cpus.c
migration.c
qapi-schema.json

diff --cc cpus.c
Simple merge
diff --cc migration.c
Simple merge
Simple merge