[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/29] monitor: Port handler_10 to use QDict
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 18/29] monitor: Port handler_10 to use QDict |
Date: |
Thu, 13 Aug 2009 10:50:17 -0300 |
This commit ports command handlers that receive ten arguments to use
the new monitor's dictionary.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/monitor.c b/monitor.c
index 645d9e2..675b321 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1765,18 +1765,15 @@ static void do_acl_remove(Monitor *mon, const QDict
*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 QDict *qdict)
{
CPUState *cenv;
- 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;
- uint64_t misc = ((uint64_t)misc_hi << 32) | misc_lo;
+ int cpu_index = qdict_get_int(qdict, "cpu_index");
+ int bank = qdict_get_int(qdict, "bank");
+ uint64_t status = qdict_get_uint64(qdict, "status");
+ uint64_t mcg_status = qdict_get_uint64(qdict, "mcg_status");
+ uint64_t addr = qdict_get_uint64(qdict, "addr");
+ uint64_t misc = qdict_get_uint64(qdict, "misc");
for (cenv = first_cpu; cenv != NULL; cenv = cenv->next_cpu)
if (cenv->cpu_index == cpu_index && cenv->mcg_cap) {
@@ -2666,9 +2663,6 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
void *str_allocated[MAX_ARGS];
void *args[MAX_ARGS];
void (*handler_d)(Monitor *mon, const QDict *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);
@@ -2948,14 +2942,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.67.gea5b1
- [Qemu-devel] [PATCH 09/29] monitor: Port handler_0 to use QDict, (continued)
- [Qemu-devel] [PATCH 09/29] monitor: Port handler_0 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 08/29] monitor: Export QDict header, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 11/29] monitor: Port handler_2 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 10/29] monitor: Port handler_1 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 13/29] monitor: Port handler_4 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 12/29] monitor: Port handler_3 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 14/29] monitor: Port handler_5 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 15/29] monitor: Port handler_6 to use QDict, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 17/29] monitor: Drop handler_8 and handler_9, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 18/29] monitor: Port handler_10 to use QDict,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 19/29] monitor: Split monitor_handle_command(), Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 20/29] monitor: Drop unused macros, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 21/29] monitor: Drop str_allocated[], Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 22/29] monitor: Drop args[] handling code, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 23/29] monitor: fail when 'i' type is greater than 32-bit, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 24/29] monitor: Update supported types documentation, Luiz Capitulino, 2009/08/13
- [Qemu-devel] [PATCH 25/29] Add check support, Luiz Capitulino, 2009/08/13