diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-23 10:57:23 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-23 10:57:23 -0500 |
| commit | f03d07d4683b2e8325a7cb60b4e14b977b1a869c (patch) | |
| tree | 6e1d1204a3a9b939a7b1badbf7749fd8fe896efa /include | |
| parent | 3988982c82ad4173dea376fea30e5432d36146db (diff) | |
| parent | 9781c3716a4b529a2af64502926a57c11e69e6ca (diff) | |
| download | qemu-f03d07d4683b2e8325a7cb60b4e14b977b1a869c.tar.gz | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/migration.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index 701709a1e9..08c772d4dc 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -49,6 +49,7 @@ struct MigrationState int64_t dirty_bytes_rate; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; + int64_t setup_time; }; void process_incoming_migration(QEMUFile *f); @@ -77,6 +78,10 @@ void fd_start_incoming_migration(const char *path, Error **errp); void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp); +void rdma_start_outgoing_migration(void *opaque, const char *host_port, Error **errp); + +void rdma_start_incoming_migration(const char *host_port, Error **errp); + void migrate_fd_error(MigrationState *s); void migrate_fd_connect(MigrationState *s); @@ -109,6 +114,8 @@ uint64_t xbzrle_mig_pages_transferred(void); uint64_t xbzrle_mig_pages_overflow(void); uint64_t xbzrle_mig_pages_cache_miss(void); +void ram_handle_compressed(void *host, uint8_t ch, uint64_t size); + /** * @migrate_add_blocker - prevent migration from proceeding * |