From patchwork Tue Feb 18 08:50:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrhines@linux.vnet.ibm.com X-Patchwork-Id: 321326 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 BB8582C00D0 for ; Tue, 18 Feb 2014 19:57:23 +1100 (EST) Received: from localhost ([::1]:47220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFgUT-0001RB-Mo for incoming@patchwork.ozlabs.org; Tue, 18 Feb 2014 03:57:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFgOw-0001NK-RC for qemu-devel@nongnu.org; Tue, 18 Feb 2014 03:51:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFgOn-0001iV-T0 for qemu-devel@nongnu.org; Tue, 18 Feb 2014 03:51:38 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:47566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFgOn-0001iN-NT for qemu-devel@nongnu.org; Tue, 18 Feb 2014 03:51:29 -0500 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Feb 2014 01:51:29 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 18 Feb 2014 01:51:26 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 9909919D8042 for ; Tue, 18 Feb 2014 01:51:24 -0700 (MST) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp08026.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1I8p2Kl57016340 for ; Tue, 18 Feb 2014 09:51:02 +0100 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1I8pOkA007234 for ; Tue, 18 Feb 2014 01:51:25 -0700 Received: from mrhinesdev.crl.ibm.com ([9.186.105.50]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s1I8oYNG004973; Tue, 18 Feb 2014 01:51:20 -0700 From: mrhines@linux.vnet.ibm.com To: qemu-devel@nongnu.org Date: Tue, 18 Feb 2014 16:50:27 +0800 Message-Id: <1392713429-18201-11-git-send-email-mrhines@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1392713429-18201-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1392713429-18201-1-git-send-email-mrhines@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14021808-0928-0000-0000-000006C72A05 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.110.150 Cc: GILR@il.ibm.com, SADEKJ@il.ibm.com, pbonzini@redhat.com, quintela@redhat.com, EREZH@il.ibm.com, owasserm@redhat.com, junqing.wang@cs2c.com.cn, onom@us.ibm.com, abali@us.ibm.com, isaku.yamahata@gmail.com, gokul@us.ibm.com, dbulkow@gmail.com, hinesmr@cn.ibm.com, BIRAN@il.ibm.com, lig.fnst@cn.fujitsu.com, "Michael R. Hines" Subject: [Qemu-devel] [RFC PATCH v2 10/12] mc: expose tunable parameter for checkpointing frequency 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: "Michael R. Hines" This exposes a QMP command that allows the management software or policy to control the frequency of micro-checkpointing. Signed-off-by: Michael R. Hines --- hmp-commands.hx | 16 +++++++++++++++- hmp.c | 6 ++++++ hmp.h | 1 + qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ 5 files changed, 58 insertions(+), 1 deletion(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index f3fc514..2066c76 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -888,7 +888,7 @@ ETEXI "\n\t\t\t -b for migration without shared storage with" " full copy of disk\n\t\t\t -i for migration without " "shared storage with incremental copy of disk " - "(base image shared between src and destination)", + "(base image shared between src and destination)", .mhandler.cmd = hmp_migrate, }, @@ -965,6 +965,20 @@ Set maximum tolerated downtime (in seconds) for migration. ETEXI { + .name = "migrate-set-mc-delay", + .args_type = "value:i", + .params = "value", + .help = "Set maximum delay (in milliseconds) between micro-checkpoints", + .mhandler.cmd = hmp_migrate_set_mc_delay, + }, + +STEXI +@item migrate-set-mc-delay @var{millisecond} +@findex migrate-set-mc-delay +Set maximum delay (in milliseconds) between micro-checkpoints. +ETEXI + + { .name = "migrate_set_capability", .args_type = "capability:s,state:b", .params = "capability state", diff --git a/hmp.c b/hmp.c index edf062e..9880bc8 100644 --- a/hmp.c +++ b/hmp.c @@ -1029,6 +1029,12 @@ void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict) qmp_migrate_set_downtime(value, NULL); } +void hmp_migrate_set_mc_delay(Monitor *mon, const QDict *qdict) +{ + int64_t value = qdict_get_int(qdict, "value"); + qmp_migrate_set_mc_delay(value, NULL); +} + void hmp_migrate_set_cache_size(Monitor *mon, const QDict *qdict) { int64_t value = qdict_get_int(qdict, "value"); diff --git a/hmp.h b/hmp.h index ed58f0e..068b2c1 100644 --- a/hmp.h +++ b/hmp.h @@ -60,6 +60,7 @@ void hmp_drive_mirror(Monitor *mon, const QDict *qdict); void hmp_drive_backup(Monitor *mon, const QDict *qdict); void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); +void hmp_migrate_set_mc_delay(Monitor *mon, const QDict *qdict); void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict); void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict); void hmp_migrate_set_cache_size(Monitor *mon, const QDict *qdict); diff --git a/qapi-schema.json b/qapi-schema.json index 7306adc..98abdac 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2160,6 +2160,19 @@ { 'command': 'migrate_set_downtime', 'data': {'value': 'number'} } ## +# @migrate-set-mc-delay +# +# Set delay (in milliseconds) between micro checkpoints. +# +# @value: maximum delay in milliseconds +# +# Returns: nothing on success +# +# Since: 2.x +## +{ 'command': 'migrate-set-mc-delay', 'data': {'value': 'int'} } + +## # @migrate_set_speed # # Set maximum speed for migration. diff --git a/qmp-commands.hx b/qmp-commands.hx index cce6b81..d8b9c34 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -754,6 +754,29 @@ Example: EQMP { + .name = "migrate-set-mc-delay", + .args_type = "value:i", + .mhandler.cmd_new = qmp_marshal_input_migrate_set_mc_delay, + }, + +SQMP +migrate-set-mc-delay +-------------------- + +Set maximum delay (in milliseconds) between micro-checkpoints. + +Arguments: + +- "value": maximum delay (json-int) + +Example: + +-> { "execute": "migrate-set-mc-delay", "arguments": { "value": 100 } } +<- { "return": {} } + +EQMP + + { .name = "client_migrate_info", .args_type = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?", .params = "protocol hostname port tls-port cert-subject",