From patchwork Tue Dec 6 17:54:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 129791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 367151007D5 for ; Wed, 7 Dec 2011 06:05:34 +1100 (EST) Received: from localhost ([::1]:51458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RY0KQ-00055H-IH for incoming@patchwork.ozlabs.org; Tue, 06 Dec 2011 14:05:22 -0500 Received: from eggs.gnu.org ([140.186.70.92]:45607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RY0KB-00051u-S8 for qemu-devel@nongnu.org; Tue, 06 Dec 2011 14:05:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RY0K7-0004Ho-8i for qemu-devel@nongnu.org; Tue, 06 Dec 2011 14:05:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RY0K7-0004HN-22 for qemu-devel@nongnu.org; Tue, 06 Dec 2011 14:05:03 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pB6J4UUU006950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Dec 2011 14:05:02 -0500 Received: from localhost (ovpn-113-121.phx2.redhat.com [10.3.113.121]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pB6HtKfS006318; Tue, 6 Dec 2011 12:55:20 -0500 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Tue, 6 Dec 2011 15:54:31 -0200 Message-Id: <1323194072-20046-22-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1323194072-20046-1-git-send-email-lcapitulino@redhat.com> References: <1323194072-20046-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 21/22] qapi: Convert migrate_set_downtime 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 Signed-off-by: Luiz Capitulino --- hmp-commands.hx | 3 +-- hmp.c | 6 ++++++ hmp.h | 1 + migration.c | 13 ++++--------- migration.h | 3 --- qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 5 +---- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index e48c2ca..6ba694d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -801,8 +801,7 @@ ETEXI .args_type = "value:T", .params = "value", .help = "set maximum tolerated downtime (in seconds) for migrations", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_migrate_set_downtime, + .mhandler.cmd = hmp_migrate_set_downtime, }, STEXI diff --git a/hmp.c b/hmp.c index 92bb08f..04e6b73 100644 --- a/hmp.c +++ b/hmp.c @@ -667,3 +667,9 @@ void hmp_migrate_cancel(Monitor *mon, const QDict *qdict) { qmp_migrate_cancel(NULL); } + +void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict) +{ + double value = qdict_get_double(qdict, "value"); + qmp_migrate_set_downtime(value, NULL); +} diff --git a/hmp.h b/hmp.h index 2b0c1e4..9182622 100644 --- a/hmp.h +++ b/hmp.h @@ -47,5 +47,6 @@ void hmp_balloon(Monitor *mon, const QDict *qdict); void hmp_block_resize(Monitor *mon, const QDict *qdict); void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict); void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); +void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); #endif diff --git a/migration.c b/migration.c index fa603d6..a563162 100644 --- a/migration.c +++ b/migration.c @@ -490,14 +490,9 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } -int do_migrate_set_downtime(Monitor *mon, const QDict *qdict, - QObject **ret_data) +void qmp_migrate_set_downtime(double value, Error **errp) { - double d; - - d = qdict_get_double(qdict, "value") * 1e9; - d = MAX(0, MIN(UINT64_MAX, d)); - max_downtime = (uint64_t)d; - - return 0; + value *= 1e9; + value = MAX(0, MIN(UINT64_MAX, value)); + max_downtime = (uint64_t)value; } diff --git a/migration.h b/migration.h index ff2e40b..539f8f1 100644 --- a/migration.h +++ b/migration.h @@ -46,9 +46,6 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data); uint64_t migrate_max_downtime(void); -int do_migrate_set_downtime(Monitor *mon, const QDict *qdict, - QObject **ret_data); - void do_info_migrate_print(Monitor *mon, const QObject *data); void do_info_migrate(Monitor *mon, QObject **ret_data); diff --git a/qapi-schema.json b/qapi-schema.json index d638f12..d9b9fa1 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1140,3 +1140,16 @@ # Since: 0.14.0 ## { 'command': 'migrate_cancel' } + +## +# @migrate_set_downtime +# +# Set maximum tolerated downtime for migration. +# +# @value: maximum downtime in seconds +# +# Returns: nothing on success +# +# Since: 0.14.0 +## +{ 'command': 'migrate_set_downtime', 'data': {'value': 'number'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index 5eb4b76..b4cadeb 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -518,10 +518,7 @@ EQMP { .name = "migrate_set_downtime", .args_type = "value:T", - .params = "value", - .help = "set maximum tolerated downtime (in seconds) for migrations", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_migrate_set_downtime, + .mhandler.cmd_new = qmp_marshal_input_migrate_set_downtime, }, SQMP