From patchwork Mon Dec 6 18:24:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74456 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 73FAAB70AF for ; Tue, 7 Dec 2010 06:04:32 +1100 (EST) Received: from localhost ([127.0.0.1]:45126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPgMP-0007bE-MF for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 14:04:29 -0500 Received: from [140.186.70.92] (port=36276 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfkC-0003Ph-Cn for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:25:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfkB-0004JC-8m for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:25:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfkA-0004Ih-Nz for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:59 -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 oB6IOvlp012148 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:57 -0500 Received: from localhost ([10.3.113.17]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOuU3030176; Mon, 6 Dec 2010 13:24:57 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:24:10 -0200 Message-Id: <1291659852-23028-24-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> References: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 23/25] Monitor: Convert do_info_migrate_print() into do_info_migrate() 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 The new handler directly calls qmp_query_migrate() to gather data and then prints it. This change allows us to drop the user_print callback. Signed-off-by: Luiz Capitulino --- migration.c | 8 ++++++-- migration.h | 2 +- monitor.c | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/migration.c b/migration.c index ed253af..df10354 100644 --- a/migration.c +++ b/migration.c @@ -187,13 +187,15 @@ static void migrate_print_status(Monitor *mon, const char *name, qdict_get_int(qdict, "total") >> 10); } -void do_info_migrate_print(Monitor *mon, const QObject *data) +void do_info_migrate(Monitor *mon) { QDict *qdict; + QObject *data; + qmp_query_migrate(NULL, &data); qdict = qobject_to_qdict(data); if (qdict_size(qdict) == 0) { - return; + goto out; } monitor_printf(mon, "Migration status: %s\n", @@ -206,6 +208,8 @@ void do_info_migrate_print(Monitor *mon, const QObject *data) if (qdict_haskey(qdict, "disk")) { migrate_print_status(mon, "disk", qdict); } +out: + qobject_decref(data); } static void migrate_put_status(QDict *qdict, const char *name, diff --git a/migration.h b/migration.h index 30ee679..96d4eb3 100644 --- a/migration.h +++ b/migration.h @@ -65,7 +65,7 @@ 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); void qmp_query_migrate(Monitor *mon, QObject **ret_data); diff --git a/monitor.c b/monitor.c index 3b6137e..97bab21 100644 --- a/monitor.c +++ b/monitor.c @@ -2615,8 +2615,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show migration status", - .user_print = do_info_migrate_print, - .mhandler.info_new = qmp_query_migrate, + .mhandler.info = do_info_migrate, }, { .name = "balloon",