| Message ID | 1487006388-7966-4-git-send-email-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > include/migration/migration.h | 1 + > migration/migration.c | 9 +++++++++ > qapi-schema.json | 5 +++-- > 3 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 7528cc2..e8bba55 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -308,6 +308,7 @@ bool migrate_postcopy_ram(void); > bool migrate_zero_blocks(void); > > bool migrate_auto_converge(void); > +bool migrate_use_multifd(void); > > int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, > uint8_t *dst, int dlen); > diff --git a/migration/migration.c b/migration/migration.c > index 2b179c6..37af7a4 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1369,6 +1369,15 @@ bool migrate_use_events(void) > return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS]; > } > > +bool migrate_use_multifd(void) > +{ > + MigrationState *s; > + > + s = migrate_get_current(); > + > + return s->enabled_capabilities[MIGRATION_CAPABILITY_X_MULTIFD]; > +} > + > int migrate_use_xbzrle(void) > { > MigrationState *s; > diff --git a/qapi-schema.json b/qapi-schema.json > index 61151f3..ff7579e 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -865,12 +865,13 @@ > # side, this process is called COarse-Grain LOck Stepping (COLO) for > # Non-stop Service. (since 2.8) > # > +# @x-multifd: Use more than one fd for migration (since 2.9) > +# > # Since: 1.2 > ## > { 'enum': 'MigrationCapability', > 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', > - 'compress', 'events', 'postcopy-ram', 'x-colo'] } > - > + 'compress', 'events', 'postcopy-ram', 'x-colo', 'x-multifd'] } That needs a minor remerge after 'release-ram' just went in. Dave > ## > # @MigrationCapabilityStatus: > # > -- > 2.7.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/migration.h b/include/migration/migration.h index 7528cc2..e8bba55 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -308,6 +308,7 @@ bool migrate_postcopy_ram(void); bool migrate_zero_blocks(void); bool migrate_auto_converge(void); +bool migrate_use_multifd(void); int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, uint8_t *dst, int dlen); diff --git a/migration/migration.c b/migration/migration.c index 2b179c6..37af7a4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1369,6 +1369,15 @@ bool migrate_use_events(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS]; } +bool migrate_use_multifd(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_X_MULTIFD]; +} + int migrate_use_xbzrle(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index 61151f3..ff7579e 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -865,12 +865,13 @@ # side, this process is called COarse-Grain LOck Stepping (COLO) for # Non-stop Service. (since 2.8) # +# @x-multifd: Use more than one fd for migration (since 2.9) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', - 'compress', 'events', 'postcopy-ram', 'x-colo'] } - + 'compress', 'events', 'postcopy-ram', 'x-colo', 'x-multifd'] } ## # @MigrationCapabilityStatus: #