From patchwork Mon Jan 25 13:23:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 43626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A3762B7C09 for ; Tue, 26 Jan 2010 00:32:34 +1100 (EST) Received: from localhost ([127.0.0.1]:36178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZP2h-0007UN-Kn for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2010 08:31:47 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZOuZ-00011g-0l for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZOuS-0000uP-Ch for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:20 -0500 Received: from [199.232.76.173] (port=42842 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOuR-0000u1-DF for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:16 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:60576) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZOuQ-0003U9-N1 for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:15 -0500 Received: from blackfin.pond.sub.org (pD9E3A875.dip.t-dialin.net [217.227.168.117]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 6BBE22E2AF7 for ; Mon, 25 Jan 2010 14:22:57 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 4337242C; Mon, 25 Jan 2010 14:23:09 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 25 Jan 2010 14:23:05 +0100 Message-Id: <1264425788-8245-6-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1264425788-8245-1-git-send-email-armbru@redhat.com> References: <1264425788-8245-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH v3 5/8] monitor: convert do_migrate_set_speed() to QObject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Markus Armbruster --- migration.c | 2 +- migration.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/migration.c b/migration.c index 6abdc65..cd8d9e6 100644 --- a/migration.c +++ b/migration.c @@ -106,7 +106,7 @@ void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) s->cancel(s); } -void do_migrate_set_speed(Monitor *mon, const QDict *qdict) +void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) { double d; FdMigrationState *s; diff --git a/migration.h b/migration.h index cbd456b..3ac208b 100644 --- a/migration.h +++ b/migration.h @@ -56,7 +56,7 @@ void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data); -void do_migrate_set_speed(Monitor *mon, const QDict *qdict); +void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data); uint64_t migrate_max_downtime(void); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 9d2359d..2354e4f 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -764,7 +764,8 @@ ETEXI .args_type = "value:b", .params = "value", .help = "set maximum speed (in bytes) for migrations", - .mhandler.cmd = do_migrate_set_speed, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_migrate_set_speed, }, STEXI