[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary |
Date: |
Tue, 28 Jul 2009 19:05:01 -0300 |
This commit ports command handlers that receive four arguments to use
the new monitor's dictionary.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/monitor.c b/monitor.c
index 07fc14a..f9ab788 100644
--- a/monitor.c
+++ b/monitor.c
@@ -867,10 +867,13 @@ static void do_print(Monitor *mon, int count, int format,
int size,
monitor_printf(mon, "\n");
}
-static void do_memory_save(Monitor *mon, unsigned int valh, unsigned int vall,
- uint32_t size, const char *filename)
+static void do_memory_save(Monitor *mon, const struct qemu_dict *qdict)
{
FILE *f;
+ unsigned int valh = (long) qemu_dict_get(qdict, "val_h");
+ unsigned int vall = (long) qemu_dict_get(qdict, "val_l");
+ uint32_t size = (long) qemu_dict_get(qdict, "size");
+ const char *filename = qemu_dict_get(qdict, "filename");
target_long addr = GET_TLONG(valh, vall);
uint32_t l;
CPUState *env;
@@ -897,13 +900,15 @@ static void do_memory_save(Monitor *mon, unsigned int
valh, unsigned int vall,
fclose(f);
}
-static void do_physical_memory_save(Monitor *mon, unsigned int valh,
- unsigned int vall, uint32_t size,
- const char *filename)
+static void do_physical_memory_save(Monitor *mon, const struct qemu_dict
*qdict)
{
FILE *f;
uint32_t l;
uint8_t buf[1024];
+ unsigned int valh = (long) qemu_dict_get(qdict, "val_h");
+ unsigned int vall = (long) qemu_dict_get(qdict, "val_l");
+ uint32_t size = (long) qemu_dict_get(qdict, "size");
+ const char *filename = qemu_dict_get(qdict, "filename");
target_phys_addr_t addr = GET_TPHYSADDR(valh, vall);
f = fopen(filename, "wb");
@@ -2668,8 +2673,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_4)(Monitor *mon, void *arg0, void *arg1, void *arg2,
- void *arg3);
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,
@@ -2969,13 +2972,10 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
case 1:
case 2:
case 3:
+ case 4:
handler_d = cmd->handler;
handler_d(mon, qdict);
break;
- case 4:
- handler_4 = cmd->handler;
- handler_4(mon, args[0], args[1], args[2], args[3]);
- break;
case 5:
handler_5 = cmd->handler;
handler_5(mon, args[0], args[1], args[2], args[3], args[4]);
--
1.6.4.rc3.12.gdf73a
- [Qemu-devel] [PATCH 02/25] net: Fix do_set_link() return type, (continued)
- [Qemu-devel] [PATCH 02/25] net: Fix do_set_link() return type, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 03/25] Add wrappers to functions used by the Monitor, Luiz Capitulino, 2009/07/28
- [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 <=
- [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, 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