From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MVuol-00011J-Td for qemu-devel@nongnu.org; Tue, 28 Jul 2009 18:06:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MVuog-0000ux-UF for qemu-devel@nongnu.org; Tue, 28 Jul 2009 18:06:43 -0400 Received: from [199.232.76.173] (port=49665 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MVuog-0000uP-MD for qemu-devel@nongnu.org; Tue, 28 Jul 2009 18:06:38 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37539) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MVuof-0000ce-T2 for qemu-devel@nongnu.org; Tue, 28 Jul 2009 18:06:38 -0400 From: Luiz Capitulino Date: Tue, 28 Jul 2009 19:05:06 -0300 Message-Id: <1248818713-11261-19-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1248818713-11261-1-git-send-email-lcapitulino@redhat.com> References: <1248818713-11261-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 18/25] monitor: Port handler_10 to use the dictionary List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, dlaor@redhat.com, avi@redhat.com, Luiz Capitulino This commit ports command handlers that receive ten arguments to use the new monitor's dictionary. Signed-off-by: Luiz Capitulino --- monitor.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/monitor.c b/monitor.c index 790d814..93793b8 100644 --- a/monitor.c +++ b/monitor.c @@ -1768,14 +1768,19 @@ static void do_acl_remove(Monitor *mon, const struct qemu_dict *qdict) } #if defined(TARGET_I386) -static void do_inject_mce(Monitor *mon, - int cpu_index, int bank, - unsigned status_hi, unsigned status_lo, - unsigned mcg_status_hi, unsigned mcg_status_lo, - unsigned addr_hi, unsigned addr_lo, - unsigned misc_hi, unsigned misc_lo) +static void do_inject_mce(Monitor *mon, const struct qemu_dict *qdict) { CPUState *cenv; + long cpu_index = (long) qemu_dict_get(qdict, "cpu_index"); + long bank = (long) qemu_dict_get(qdict, "bank"); + unsigned status_hi = (long) qemu_dict_get(qdict, "status_h"); + unsigned status_lo = (long) qemu_dict_get(qdict, "status_l"); + unsigned mcg_status_hi = (long) qemu_dict_get(qdict, "mcg_status_h"); + unsigned mcg_status_lo = (long) qemu_dict_get(qdict, "mcg_status_l"); + unsigned addr_hi = (long) qemu_dict_get(qdict, "addr_h"); + unsigned addr_lo = (long) qemu_dict_get(qdict, "addr_l"); + unsigned misc_hi = (long) qemu_dict_get(qdict, "misc_h"); + unsigned misc_lo = (long) qemu_dict_get(qdict, "misc_l"); uint64_t status = ((uint64_t)status_hi << 32) | status_lo; uint64_t mcg_status = ((uint64_t)mcg_status_hi << 32) | mcg_status_lo; uint64_t addr = ((uint64_t)addr_hi << 32) | addr_lo; @@ -2698,9 +2703,6 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) void *args[MAX_ARGS]; struct qemu_dict *qdict; void (*handler_d)(Monitor *mon, const struct qemu_dict *qdict); - void (*handler_10)(Monitor *mon, void *arg0, void *arg1, void *arg2, - void *arg3, void *arg4, void *arg5, void *arg6, - void *arg7, void *arg8, void *arg9); #ifdef DEBUG monitor_printf(mon, "command='%s'\n", cmdline); @@ -2989,14 +2991,10 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) case 5: case 6: case 7: + case 10: handler_d = cmd->handler; handler_d(mon, qdict); break; - case 10: - handler_10 = cmd->handler; - handler_10(mon, args[0], args[1], args[2], args[3], args[4], args[5], - args[6], args[7], args[8], args[9]); - break; default: monitor_printf(mon, "unsupported number of arguments: %d\n", nb_args); goto fail; -- 1.6.4.rc3.12.gdf73a