From patchwork Mon Aug 3 16:57:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 30662 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 22B9BB6F20 for ; Tue, 4 Aug 2009 05:36:52 +1000 (EST) Received: from localhost ([127.0.0.1]:46842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY3Ky-0004L9-4x for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 15:36:48 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MY0ru-00066U-4b for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MY0rq-00064C-As for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:37 -0400 Received: from [199.232.76.173] (port=55280 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY0rq-000647-4J for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:34 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56326) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MY0rp-0003AL-HU for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:33 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73GwW6e026299; Mon, 3 Aug 2009 12:58:32 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73GwVZ5015398; Mon, 3 Aug 2009 12:58:32 -0400 Received: from localhost (vpn-10-1.bos.redhat.com [10.16.10.1]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73GwUaO030113; Mon, 3 Aug 2009 12:58:31 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 13:57:06 -0300 Message-Id: <1249318642-19324-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> References: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 09/25] monitor: Port handler_0 to use the dictionary 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 commit ports command handlers that receive no arguments to use the new monitor's dictionary. It might seem no sense to do this, as the handlers have no arguments, but at the end of this porting work all handlers will have the same structure. Signed-off-by: Luiz Capitulino --- migration.c | 2 +- migration.h | 3 ++- monitor.c | 18 +++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/migration.c b/migration.c index ee64d41..bec8052 100644 --- a/migration.c +++ b/migration.c @@ -72,7 +72,7 @@ void do_migrate(Monitor *mon, int detach, const char *uri) } } -void do_migrate_cancel(Monitor *mon) +void do_migrate_cancel(Monitor *mon, const QDict *qdict) { MigrationState *s = current_migration; diff --git a/migration.h b/migration.h index 37c7f8e..320512b 100644 --- a/migration.h +++ b/migration.h @@ -14,6 +14,7 @@ #ifndef QEMU_MIGRATION_H #define QEMU_MIGRATION_H +#include "qdict.h" #include "qemu-common.h" #define MIG_STATE_ERROR -1 @@ -51,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri); void do_migrate(Monitor *mon, int detach, const char *uri); -void do_migrate_cancel(Monitor *mon); +void do_migrate_cancel(Monitor *mon, const QDict *qdict); void do_migrate_set_speed(Monitor *mon, const char *value); diff --git a/monitor.c b/monitor.c index 8127aa2..4cd9d6a 100644 --- a/monitor.c +++ b/monitor.c @@ -426,7 +426,7 @@ static void do_info_cpu_stats(Monitor *mon) } #endif -static void do_quit(Monitor *mon) +static void do_quit(Monitor *mon, const QDict *qdict) { exit(0); } @@ -559,7 +559,7 @@ static void do_singlestep(Monitor *mon, const char *option) } } -static void do_stop(Monitor *mon) +static void do_stop(Monitor *mon, const QDict *qdict) { vm_stop(EXCP_INTERRUPT); } @@ -571,7 +571,7 @@ struct bdrv_iterate_context { int err; }; -static void do_cont(Monitor *mon) +static void do_cont(Monitor *mon, const QDict *qdict) { struct bdrv_iterate_context context = { mon, 0 }; @@ -587,7 +587,7 @@ static void bdrv_key_cb(void *opaque, int err) /* another key was set successfully, retry to continue */ if (!err) - do_cont(mon); + do_cont(mon, NULL); } static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs) @@ -1246,12 +1246,12 @@ static void do_boot_set(Monitor *mon, const char *bootdevice) } } -static void do_system_reset(Monitor *mon) +static void do_system_reset(Monitor *mon, const QDict *qdict) { qemu_system_reset_request(); } -static void do_system_powerdown(Monitor *mon) +static void do_system_powerdown(Monitor *mon, const QDict *qdict) { qemu_system_powerdown_request(); } @@ -2640,7 +2640,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) void *str_allocated[MAX_ARGS]; void *args[MAX_ARGS]; QDict *qdict; - void (*handler_0)(Monitor *mon); + void (*handler_d)(Monitor *mon, const QDict *qdict); void (*handler_1)(Monitor *mon, void *arg0); void (*handler_2)(Monitor *mon, void *arg0, void *arg1); void (*handler_3)(Monitor *mon, void *arg0, void *arg1, void *arg2); @@ -2942,8 +2942,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) switch(nb_args) { case 0: - handler_0 = cmd->handler; - handler_0(mon); + handler_d = cmd->handler; + handler_d(mon, qdict); break; case 1: handler_1 = cmd->handler;