From patchwork Thu Feb 11 01:50:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 45098 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 1CD85B7C67 for ; Thu, 11 Feb 2010 13:24:21 +1100 (EST) Received: from localhost ([127.0.0.1]:45851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOfx-0001SG-AD for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 21:21:05 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfOCt-0007Jp-8P for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:51:03 -0500 Received: from [199.232.76.173] (port=57757 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOCs-0007JQ-Rc for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:51:02 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfOCo-0001Ke-DA for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:51:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42885) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfOCn-0001KY-Ty for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:58 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1ov6D009059 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Feb 2010 20:50:57 -0500 Received: from localhost (vpn-10-105.rdu.redhat.com [10.11.10.105]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1ot8j031222; Wed, 10 Feb 2010 20:50:56 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 10 Feb 2010 23:50:02 -0200 Message-Id: <1265853007-27300-17-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> References: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 16/21] Monitor: Rename cmd_new_ret() 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 Now that all handlers are converted to cmd_new_ret(), we can rename it back to cmd_new(). But now it returns a value. Signed-off-by: Luiz Capitulino --- monitor.c | 9 ++------- qemu-monitor.hx | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/monitor.c b/monitor.c index 37a2a48..6eb0e2c 100644 --- a/monitor.c +++ b/monitor.c @@ -98,13 +98,12 @@ typedef struct mon_cmd_t { const char *params; const char *help; void (*user_print)(Monitor *mon, const QObject *data); - int (*cmd_new_ret)(Monitor *mon, const QDict *params, QObject **ret_data); union { void (*info)(Monitor *mon); void (*info_new)(Monitor *mon, QObject **ret_data); int (*info_async)(Monitor *mon, MonitorCompletion *cb, void *opaque); void (*cmd)(Monitor *mon, const QDict *qdict); - void (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data); + int (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data); int (*cmd_async)(Monitor *mon, const QDict *params, MonitorCompletion *cb, void *opaque); } mhandler; @@ -3846,11 +3845,7 @@ static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd, { QObject *data = NULL; - if (cmd->cmd_new_ret) { - cmd->cmd_new_ret(mon, params, &data); - } else { - cmd->mhandler.cmd_new(mon, params, &data); - } + cmd->mhandler.cmd_new(mon, params, &data); if (is_async_return(data)) { /* diff --git a/qemu-monitor.hx b/qemu-monitor.hx index d5b344e..7f9d261 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -43,7 +43,7 @@ ETEXI .params = "[subcommand]", .help = "show various information about the system state", .user_print = monitor_user_noop, - .cmd_new_ret = do_info, + .mhandler.cmd_new = do_info, }, STEXI @@ -123,7 +123,7 @@ ETEXI .params = "", .help = "quit the emulator", .user_print = monitor_user_noop, - .cmd_new_ret = do_quit, + .mhandler.cmd_new = do_quit, }, STEXI @@ -138,7 +138,7 @@ ETEXI .params = "[-f] device", .help = "eject a removable medium (use -f to force it)", .user_print = monitor_user_noop, - .cmd_new_ret = do_eject, + .mhandler.cmd_new = do_eject, }, STEXI @@ -153,7 +153,7 @@ ETEXI .params = "device filename [format]", .help = "change a removable medium, optional format", .user_print = monitor_user_noop, - .cmd_new_ret = do_change, + .mhandler.cmd_new = do_change, }, STEXI @@ -303,7 +303,7 @@ ETEXI .params = "", .help = "stop emulation", .user_print = monitor_user_noop, - .cmd_new_ret = do_stop, + .mhandler.cmd_new = do_stop, }, STEXI @@ -318,7 +318,7 @@ ETEXI .params = "", .help = "resume emulation", .user_print = monitor_user_noop, - .cmd_new_ret = do_cont, + .mhandler.cmd_new = do_cont, }, STEXI @@ -494,7 +494,7 @@ ETEXI .params = "", .help = "reset the system", .user_print = monitor_user_noop, - .cmd_new_ret = do_system_reset, + .mhandler.cmd_new = do_system_reset, }, STEXI @@ -510,7 +510,7 @@ ETEXI .params = "", .help = "send system power down event", .user_print = monitor_user_noop, - .cmd_new_ret = do_system_powerdown, + .mhandler.cmd_new = do_system_powerdown, }, STEXI @@ -604,7 +604,7 @@ ETEXI .params = "index", .help = "set the default CPU", .user_print = monitor_user_noop, - .cmd_new_ret = do_cpu_set, + .mhandler.cmd_new = do_cpu_set, }, STEXI @@ -705,7 +705,7 @@ ETEXI .params = "addr size file", .help = "save to disk virtual memory dump starting at 'addr' of size 'size'", .user_print = monitor_user_noop, - .cmd_new_ret = do_memory_save, + .mhandler.cmd_new = do_memory_save, }, STEXI @@ -720,7 +720,7 @@ ETEXI .params = "addr size file", .help = "save to disk physical memory dump starting at 'addr' of size 'size'", .user_print = monitor_user_noop, - .cmd_new_ret = do_physical_memory_save, + .mhandler.cmd_new = do_physical_memory_save, }, STEXI @@ -773,7 +773,7 @@ ETEXI "shared storage with incremental copy of disk " "(base image shared between src and destination)", .user_print = monitor_user_noop, - .cmd_new_ret = do_migrate, + .mhandler.cmd_new = do_migrate, }, @@ -791,7 +791,7 @@ ETEXI .params = "", .help = "cancel the current VM migration", .user_print = monitor_user_noop, - .cmd_new_ret = do_migrate_cancel, + .mhandler.cmd_new = do_migrate_cancel, }, STEXI @@ -806,7 +806,7 @@ ETEXI .params = "value", .help = "set maximum speed (in bytes) for migrations", .user_print = monitor_user_noop, - .cmd_new_ret = do_migrate_set_speed, + .mhandler.cmd_new = do_migrate_set_speed, }, STEXI @@ -821,7 +821,7 @@ ETEXI .params = "value", .help = "set maximum tolerated downtime (in seconds) for migrations", .user_print = monitor_user_noop, - .cmd_new_ret = do_migrate_set_downtime, + .mhandler.cmd_new = do_migrate_set_downtime, }, STEXI @@ -857,7 +857,7 @@ ETEXI .params = "auto|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", .help = "hot-add PCI device", .user_print = pci_device_hot_add_print, - .cmd_new_ret = pci_device_hot_add, + .mhandler.cmd_new = pci_device_hot_add, }, #endif @@ -874,7 +874,7 @@ ETEXI .params = "[[:]:]", .help = "hot remove PCI device", .user_print = monitor_user_noop, - .cmd_new_ret = do_pci_device_hot_remove, + .mhandler.cmd_new = do_pci_device_hot_remove, }, #endif @@ -1083,7 +1083,7 @@ ETEXI .params = "getfd name", .help = "receive a file descriptor via SCM rights and assign it a name", .user_print = monitor_user_noop, - .cmd_new_ret = do_getfd, + .mhandler.cmd_new = do_getfd, }, STEXI @@ -1100,7 +1100,7 @@ ETEXI .params = "closefd name", .help = "close a file descriptor previously passed via SCM rights", .user_print = monitor_user_noop, - .cmd_new_ret = do_closefd, + .mhandler.cmd_new = do_closefd, }, STEXI @@ -1117,7 +1117,7 @@ ETEXI .params = "block_passwd device password", .help = "set the password of encrypted block devices", .user_print = monitor_user_noop, - .cmd_new_ret = do_block_set_passwd, + .mhandler.cmd_new = do_block_set_passwd, }, STEXI @@ -1132,7 +1132,7 @@ ETEXI .params = "", .help = "enable QMP capabilities", .user_print = monitor_user_noop, - .cmd_new_ret = do_qmp_capabilities, + .mhandler.cmd_new = do_qmp_capabilities, }, STEXI