From patchwork Fri Dec 18 19:49:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 41427 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 906B41007D1 for ; Sat, 19 Dec 2009 06:58:38 +1100 (EST) Received: from localhost ([127.0.0.1]:51917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLitf-00030A-28 for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2009 14:53:55 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLit0-0002vK-1A for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:53:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NList-0002kh-Vp for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:53:12 -0500 Received: from [199.232.76.173] (port=37008 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NList-0002jV-Hg for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:53:07 -0500 Received: from mx20.gnu.org ([199.232.41.8]:21403) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NLisr-0007LU-46 for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:53:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLisg-0004UK-Cx for qemu-devel@nongnu.org; Fri, 18 Dec 2009 14:52:54 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBIJnT8Z017990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 18 Dec 2009 14:49:29 -0500 Received: from doriath (vpn-10-146.rdu.redhat.com [10.11.10.146]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBIJnPOG015692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 18 Dec 2009 14:49:28 -0500 Date: Fri, 18 Dec 2009 17:49:23 -0200 From: Luiz Capitulino To: qemu-devel@nongnu.org Message-ID: <20091218174923.450e2076@doriath> Organization: Red Hat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: aliguori@linux.vnet.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [FOR 0.12] monitor: Revert do_migrate_set_speed() conversion 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 This reverts commit 3a4921. do_migrate_set_speed() accepts a suffix for the 'value' argument and this is not good for QMP. We will have to add a new argument type to handle that and this will have to wait for 0.13. Signed-off-by: Luiz Capitulino --- migration.c | 2 +- migration.h | 2 +- qemu-monitor.hx | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/migration.c b/migration.c index fda61e6..598f8df 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, QObject **ret_data) +void do_migrate_set_speed(Monitor *mon, const QDict *qdict) { double d; char *ptr; diff --git a/migration.h b/migration.h index 3ac208b..cbd456b 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, QObject **ret_data); +void do_migrate_set_speed(Monitor *mon, const QDict *qdict); uint64_t migrate_max_downtime(void); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index aac0f3e..1aa7818 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -763,8 +763,7 @@ ETEXI .args_type = "value:s", .params = "value", .help = "set maximum speed (in bytes) for migrations", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_migrate_set_speed, + .mhandler.cmd = do_migrate_set_speed, }, STEXI