| Message ID | 1428474011-30797-12-git-send-email-liang.z.li@intel.com |
|---|---|
| State | New |
| Headers | show |
Liang Li <liang.z.li@intel.com> wrote: > The multiple compression threads can be turned on/off through > qmp and hmp interface before doing live migration. > > Signed-off-by: Liang Li <liang.z.li@intel.com> > Signed-off-by: Yang Zhang <yang.z.zhang@intel.com> > Reviewed-by: Dr.David Alan Gilbert <dgilbert@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com>
On 04/08/2015 12:20 AM, Liang Li wrote: > The multiple compression threads can be turned on/off through > qmp and hmp interface before doing live migration. > > Signed-off-by: Liang Li <liang.z.li@intel.com> > Signed-off-by: Yang Zhang <yang.z.zhang@intel.com> > Reviewed-by: Dr.David Alan Gilbert <dgilbert@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > --- > migration/migration.c | 7 +++++-- > qapi-schema.json | 11 ++++++++++- > 2 files changed, 15 insertions(+), 3 deletions(-) > > +# @compress: Use multiple compression threads to accelerate live migration. > +# This feature can help to reduce the migration traffic, by sending > +# compressed pages. Please note that if compress and xbzrle are both > +# on, compress only takes effect in the ram bulk stage, after that, > +# it will be disabled and only xbzrle takes effect, this can help to > +# minimize migration traffic. The feature is disabled by default. > +# (since 2.3) Maintainer can tweak this to 2.4, since we've missed 2.3. My R-b still stands.
diff --git a/migration/migration.c b/migration/migration.c index 19409e6..dc7db87 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -611,8 +611,11 @@ bool migrate_zero_blocks(void) bool migrate_use_compression(void) { - /* Disable compression before the patch series are applied */ - return false; + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_COMPRESS]; } int migrate_compress_level(void) diff --git a/qapi-schema.json b/qapi-schema.json index ac9594d..b117008 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -515,13 +515,22 @@ # to enable the capability on the source VM. The feature is disabled by # default. (since 1.6) # +# @compress: Use multiple compression threads to accelerate live migration. +# This feature can help to reduce the migration traffic, by sending +# compressed pages. Please note that if compress and xbzrle are both +# on, compress only takes effect in the ram bulk stage, after that, +# it will be disabled and only xbzrle takes effect, this can help to +# minimize migration traffic. The feature is disabled by default. +# (since 2.3) +# # @auto-converge: If enabled, QEMU will automatically throttle down the guest # to speed up convergence of RAM migration. (since 1.6) # # Since: 1.2 ## { 'enum': 'MigrationCapability', - 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks'] } + 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', + 'compress'] } ## # @MigrationCapabilityStatus