From patchwork Fri Feb 5 13:56:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 579487 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 A518C1402C4 for ; Sat, 6 Feb 2016 00:59:43 +1100 (AEDT) Received: from localhost ([::1]:48462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRgvF-0005cu-Q2 for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2016 08:59:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRgsz-0001QU-0d for qemu-devel@nongnu.org; Fri, 05 Feb 2016 08:57:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRgsx-00030t-Qx for qemu-devel@nongnu.org; Fri, 05 Feb 2016 08:57:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRgsx-00030p-Lx for qemu-devel@nongnu.org; Fri, 05 Feb 2016 08:57:19 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3240DBBF65; Fri, 5 Feb 2016 13:57:19 +0000 (UTC) Received: from localhost (dhcp193-102.pnq.redhat.com [10.65.193.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u15DvHVm031703; Fri, 5 Feb 2016 08:57:18 -0500 From: Amit Shah To: Peter Maydell Date: Fri, 5 Feb 2016 19:26:51 +0530 Message-Id: <164f59e86ed108366ddfc713266fed4614d2566d.1454680535.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu list , Amit Shah , zhanghailiang , "Dr. David Alan Gilbert" , Juan Quintela Subject: [Qemu-devel] [PULL 6/9] qmp-commands.hx: Document the missing options for migration capability commands 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 From: zhanghailiang Add the missing descriptions for the options of migration capability commands, and fix the example for query-migrate-capabilities command. Signed-off-by: zhanghailiang Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Amit Shah Message-Id: <1452829066-9764-7-git-send-email-zhang.zhanghailiang@huawei.com> [Amit: Strip whitespace] Signed-off-by: Amit Shah --- qmp-commands.hx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/qmp-commands.hx b/qmp-commands.hx index b25b97c..020e5ee 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3647,7 +3647,9 @@ Enable/Disable migration capabilities - "rdma-pin-all": pin all pages when using RDMA during migration - "auto-converge": throttle down guest to help convergence of migration - "zero-blocks": compress zero blocks during block migration +- "compress": use multiple compression threads to accelerate live migration - "events": generate events for each migration state change +- "x-postcopy-ram": postcopy mode for live migration Arguments: @@ -3675,13 +3677,24 @@ Query current migration capabilities - "rdma-pin-all" : RDMA Pin Page state (json-bool) - "auto-converge" : Auto Converge state (json-bool) - "zero-blocks" : Zero Blocks state (json-bool) + - "compress": Multiple compression threads state (json-bool) + - "events": Migration state change event state (json-bool) + - "x-postcopy-ram": postcopy ram state (json-bool) Arguments: Example: -> { "execute": "query-migrate-capabilities" } -<- { "return": [ { "state": false, "capability": "xbzrle" } ] } +<- {"return": [ + {"state": false, "capability": "xbzrle"}, + {"state": false, "capability": "rdma-pin-all"}, + {"state": false, "capability": "auto-converge"}, + {"state": false, "capability": "zero-blocks"}, + {"state": false, "capability": "compress"}, + {"state": true, "capability": "events"}, + {"state": false, "capability": "x-postcopy-ram"} + ]} EQMP