From patchwork Mon Mar 23 08:32:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 453316 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B28D3140134 for ; Mon, 23 Mar 2015 19:56:02 +1100 (AEDT) Received: from localhost ([::1]:54320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZy9P-0003xx-C4 for incoming@patchwork.ozlabs.org; Mon, 23 Mar 2015 04:55:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZy8v-0003Ku-MU for qemu-devel@nongnu.org; Mon, 23 Mar 2015 04:55:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZy8r-000620-Di for qemu-devel@nongnu.org; Mon, 23 Mar 2015 04:55:29 -0400 Received: from mga01.intel.com ([192.55.52.88]:28331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZxvw-0002EC-JF for qemu-devel@nongnu.org; Mon, 23 Mar 2015 04:42:04 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 23 Mar 2015 01:42:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,451,1422950400"; d="scan'208";a="696233975" Received: from lil.sh.intel.com (HELO localhost) ([10.239.159.70]) by fmsmga002.fm.intel.com with ESMTP; 23 Mar 2015 01:42:02 -0700 From: Liang Li To: qemu-devel@nongnu.org Date: Mon, 23 Mar 2015 16:32:26 +0800 Message-Id: <1427099549-10633-12-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427099549-10633-1-git-send-email-liang.z.li@intel.com> References: <1427099549-10633-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Cc: quintela@redhat.com, Liang Li , dgilbert@redhat.com, lcapitulino@redhat.com, yang.z.zhang@intel.com, quintela@redhate.com, amit.shah@redhat.com Subject: [Qemu-devel] [v6 11/14] migration: Add interface to control compression X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The multiple compression threads can be turned on/off through qmp and hmp interface before doing live migration. Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Dr.David Alan Gilbert Reviewed-by: Eric Blake --- migration/migration.c | 7 +++++-- qapi-schema.json | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) 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