[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary |
Date: |
Tue, 28 Jul 2009 19:05:03 -0300 |
This commit ports command handlers that receive six arguments to use
the new monitor's dictionary.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/monitor.c b/monitor.c
index 3729ee1..ed6b201 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1216,9 +1216,12 @@ static void do_mouse_button(Monitor *mon, const struct
qemu_dict *qdict)
kbd_mouse_event(0, 0, 0, mouse_button_state);
}
-static void do_ioport_read(Monitor *mon, int count, int format, int size,
- int addr, int has_index, int index)
+static void do_ioport_read(Monitor *mon, const struct qemu_dict *qdict)
{
+ int size = (long) qemu_dict_get(qdict, "size");
+ int addr = (long) qemu_dict_get(qdict, "addr");
+ int has_index = qemu_dict_exists(qdict, "index");
+ long index = (long) qemu_dict_get(qdict, "index");
uint32_t val;
int suffix;
@@ -2691,8 +2694,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_6)(Monitor *mon, void *arg0, void *arg1, void *arg2,
- void *arg3, void *arg4, void *arg5);
void (*handler_7)(Monitor *mon, void *arg0, void *arg1, void *arg2,
void *arg3, void *arg4, void *arg5, void *arg6);
void (*handler_8)(Monitor *mon, void *arg0, void *arg1, void *arg2,
@@ -2990,13 +2991,10 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
case 3:
case 4:
case 5:
+ case 6:
handler_d = cmd->handler;
handler_d(mon, qdict);
break;
- case 6:
- handler_6 = cmd->handler;
- handler_6(mon, args[0], args[1], args[2], args[3], args[4], args[5]);
- break;
case 7:
handler_7 = cmd->handler;
handler_7(mon, args[0], args[1], args[2], args[3], args[4], args[5],
--
1.6.4.rc3.12.gdf73a
- [Qemu-devel] [PATCH 05/25] monitor: New format for handlers argument types, (continued)
- [Qemu-devel] [PATCH 05/25] monitor: New format for handlers argument types, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 06/25] monitor: Setup a dictionary with handler arguments, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 07/25] monitor: Export qemu-dict.h header, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 08/25] monitor: New GET_TLONG and GET_TPHYSADDR macros, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 09/25] monitor: Port handler_0 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 10/25] monitor: Port handler_1 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 11/25] monitor: Port handler_2 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 12/25] monitor: Port handler_3 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 14/25] monitor: Port handler_5 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 16/25] monitor: Port handler_7 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 17/25] monitor: Drop handler_8 and handler_9 handling, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 18/25] monitor: Port handler_10 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command(), Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 20/25] monitor: Add a new index for str_allocated[], Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 21/25] monitor: Drop args[] from monitor_parse_command(), Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 22/25] monitor: Drop 'nb_args' from monitor_parse_command(), Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 23/25] Add check support, Luiz Capitulino, 2009/07/28