diff options
author | Chegu Vinod <chegu_vinod@hp.com> | 2013-06-24 03:49:42 -0600 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2013-07-12 20:34:58 +0200 |
commit | bde1e2ec2176c363c1783bf8887b6b1beb08dfee (patch) | |
tree | 81636d2f4f3ca3054b63301fe2f62f0fec18765d | |
parent | 3c02270db980007424d797506301826310ce2db4 (diff) |
Add 'auto-converge' migration capability
The auto-converge migration capability allows the user to specify if they
choose live migration seqeunce to automatically detect and force convergence.
Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r-- | include/migration/migration.h | 2 | ||||
-rw-r--r-- | migration.c | 9 | ||||
-rw-r--r-- | qapi-schema.json | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index f0640e0eec..bc9fde0b2a 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -125,6 +125,8 @@ void migrate_del_blocker(Error *reason); bool migrate_rdma_pin_all(void); +bool migrate_auto_converge(void); + int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, uint8_t *dst, int dlen); int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); diff --git a/migration.c b/migration.c index 635a7e7a08..184ae3ff5c 100644 --- a/migration.c +++ b/migration.c @@ -484,6 +484,15 @@ bool migrate_rdma_pin_all(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_X_RDMA_PIN_ALL]; } +bool migrate_auto_converge(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE]; +} + int migrate_use_xbzrle(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index b251d282cc..35095ff0b3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -616,7 +616,7 @@ # Since: 1.2 ## { 'enum': 'MigrationCapability', - 'data': ['xbzrle', 'x-rdma-pin-all'] } + 'data': ['xbzrle', 'x-rdma-pin-all', 'auto-converge'] } ## # @MigrationCapabilityStatus |