[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/25] monitor: Port handler_5 to use the dictionary
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 14/25] monitor: Port handler_5 to use the dictionary |
Date: |
Tue, 28 Jul 2009 19:05:02 -0300 |
This commit ports command handlers that receive five arguments to use
the new monitor's dictionary.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/monitor.c b/monitor.c
index f9ab788..3729ee1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -796,9 +796,14 @@ static inline uint32_t GET_TLONG(uint32_t h, uint32_t l)
}
#endif
-static void do_memory_dump(Monitor *mon, int count, int format, int size,
- uint32_t addrh, uint32_t addrl)
+static void do_memory_dump(Monitor *mon, const struct qemu_dict *qdict)
{
+ long count = (long) qemu_dict_get(qdict, "count");
+ long format = (long) qemu_dict_get(qdict, "format");
+ long size = (long) qemu_dict_get(qdict, "size");
+
+ uint32_t addrh = (long) qemu_dict_get(qdict, "addr_h");
+ uint32_t addrl = (long) qemu_dict_get(qdict, "addr_l");
target_long addr = GET_TLONG(addrh, addrl);
memory_dump(mon, count, format, size, addr, 0);
}
@@ -813,17 +818,24 @@ static inline uint32_t GET_TPHYSADDR(uint32_t h, uint32_t
l)
}
#endif
-static void do_physical_memory_dump(Monitor *mon, int count, int format,
- int size, uint32_t addrh, uint32_t addrl)
-
+static void do_physical_memory_dump(Monitor *mon, const struct qemu_dict
*qdict)
{
+ long count = (long) qemu_dict_get(qdict, "count");
+ long format = (long) qemu_dict_get(qdict, "format");
+ long size = (long) qemu_dict_get(qdict, "size");
+ uint32_t addrh = (long) qemu_dict_get(qdict, "addr_h");
+ uint32_t addrl = (long) qemu_dict_get(qdict, "addr_l");
+
target_phys_addr_t addr = GET_TPHYSADDR(addrh, addrl);
memory_dump(mon, count, format, size, addr, 1);
}
-static void do_print(Monitor *mon, int count, int format, int size,
- unsigned int valh, unsigned int vall)
+static void do_print(Monitor *mon, const struct qemu_dict *qdict)
{
+ long format = (long) qemu_dict_get(qdict, "format");
+ unsigned int valh = (long) qemu_dict_get(qdict, "val_h");
+ unsigned int vall = (long) qemu_dict_get(qdict, "val_l");
+
target_phys_addr_t val = GET_TPHYSADDR(valh, vall);
#if TARGET_PHYS_ADDR_BITS == 32
switch(format) {
@@ -1235,9 +1247,12 @@ static void do_ioport_read(Monitor *mon, int count, int
format, int size,
suffix, addr, size * 2, val);
}
-static void do_ioport_write(Monitor *mon, int count, int format, int size,
- int addr, int val)
+static void do_ioport_write(Monitor *mon, const struct qemu_dict *qdict)
{
+ long size = (long) qemu_dict_get(qdict, "size");
+ long addr = (long) qemu_dict_get(qdict, "addr");
+ long val = (long) qemu_dict_get(qdict, "val");
+
addr &= IOPORTS_MASK;
switch (size) {
@@ -1698,10 +1713,13 @@ static void do_acl_policy(Monitor *mon, const struct
qemu_dict *qdict)
}
}
-static void do_acl_add(Monitor *mon, const char *aclname,
- const char *match, const char *policy,
- int has_index, int index)
+static void do_acl_add(Monitor *mon, const struct qemu_dict *qdict)
{
+ const char *aclname = qemu_dict_get(qdict, "aclname");
+ const char *match = qemu_dict_get(qdict, "match");
+ const char *policy = qemu_dict_get(qdict, "policy");
+ int has_index = qemu_dict_exists(qdict, "index");
+ long index = (long) qemu_dict_get(qdict, "index");
qemu_acl *acl = find_acl(mon, aclname);
int deny, ret;
@@ -2673,8 +2691,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_5)(Monitor *mon, void *arg0, void *arg1, void *arg2,
- void *arg3, void *arg4);
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,
@@ -2973,13 +2989,10 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
case 2:
case 3:
case 4:
+ case 5:
handler_d = cmd->handler;
handler_d(mon, qdict);
break;
- case 5:
- handler_5 = cmd->handler;
- handler_5(mon, args[0], args[1], args[2], args[3], args[4]);
- break;
case 6:
handler_6 = cmd->handler;
handler_6(mon, args[0], args[1], args[2], args[3], args[4], args[5]);
--
1.6.4.rc3.12.gdf73a
- [Qemu-devel] [PATCH 04/25] monitor: Document missing supported argument types, (continued)
- [Qemu-devel] [PATCH 04/25] monitor: Document missing supported argument types, Luiz Capitulino, 2009/07/28
- [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 <=
- [Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary, Luiz Capitulino, 2009/07/28
- [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