| Message ID | 20170710163029.129912-7-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
On 07/10/2017 11:30 AM, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Reviewed-by: John Snow <jsnow@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Reviewed-by: Juan Quintela <quintela@redhat.com> > --- > migration/migration.c | 9 +++++++++ > migration/migration.h | 1 + > qapi-schema.json | 4 +++- > 3 files changed, 13 insertions(+), 1 deletion(-) > > +++ b/qapi-schema.json > @@ -903,12 +903,14 @@ > # @return-path: If enabled, migration will use the return path even > # for precopy. (since 2.10) > # > +# @dirty-bitmaps: If enabled, QEMU will migrate named dirty bitmaps. (since 2.9) We've missed 2.9; this should be 2.10. > +# > # Since: 1.2 > ## > { 'enum': 'MigrationCapability', > 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', > 'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram', > - 'block', 'return-path' ] } > + 'block', 'return-path', 'dirty-bitmaps' ] } > > ## > # @MigrationCapabilityStatus: >
diff --git a/migration/migration.c b/migration/migration.c index b13a9f496a..dac67eab69 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1280,6 +1280,15 @@ int migrate_decompress_threads(void) return s->parameters.decompress_threads; } +bool migrate_dirty_bitmaps(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS]; +} + bool migrate_use_events(void) { MigrationState *s; diff --git a/migration/migration.h b/migration/migration.h index 1d974bacce..0c6ba56423 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -170,6 +170,7 @@ bool migrate_postcopy(void); bool migrate_release_ram(void); bool migrate_postcopy_ram(void); bool migrate_zero_blocks(void); +bool migrate_dirty_bitmaps(void); bool migrate_auto_converge(void); diff --git a/qapi-schema.json b/qapi-schema.json index 485767f1ab..f1d32547ec 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -903,12 +903,14 @@ # @return-path: If enabled, migration will use the return path even # for precopy. (since 2.10) # +# @dirty-bitmaps: If enabled, QEMU will migrate named dirty bitmaps. (since 2.9) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', 'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram', - 'block', 'return-path' ] } + 'block', 'return-path', 'dirty-bitmaps' ] } ## # @MigrationCapabilityStatus: