[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict |
Date: |
Wed, 19 Aug 2009 20:07:47 -0300 |
This commit ports command handlers that receive seven arguments to
use the new monitor's dictionary.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/monitor.c b/monitor.c
index 28d9e54..bc8040e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1573,13 +1573,26 @@ static void do_stop_capture(Monitor *mon, const QDict
*qdict)
}
}
-static void do_wav_capture(Monitor *mon, const char *path,
- int has_freq, int freq,
- int has_bits, int bits,
- int has_channels, int nchannels)
-{
+static void do_wav_capture(Monitor *mon, const QDict *qdict)
+{
+ const char *path = qdict_get_str(qdict, "path");
+ int has_freq = qdict_exists(qdict, "freq");
+ int freq = -1;
+ int has_bits = qdict_exists(qdict, "bits");
+ int bits = -1;
+ int has_channels = qdict_exists(qdict, "nchannels");
+ int nchannels = -1;
CaptureState *s;
+ if (has_freq)
+ freq = qdict_get_int(qdict, "freq");
+
+ if (has_bits)
+ bits = qdict_get_int(qdict, "bits");
+
+ if (has_channels)
+ nchannels = qdict_get_int(qdict, "nchannels");
+
s = qemu_mallocz (sizeof (*s));
freq = has_freq ? freq : 44100;
@@ -2653,8 +2666,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_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,
void *arg3, void *arg4, void *arg5, void *arg6,
void *arg7);
@@ -2942,14 +2953,10 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
case 4:
case 5:
case 6:
+ case 7:
handler_d = cmd->handler;
handler_d(mon, qdict);
break;
- case 7:
- handler_7 = cmd->handler;
- handler_7(mon, args[0], args[1], args[2], args[3], args[4], args[5],
- args[6]);
- break;
case 8:
handler_8 = cmd->handler;
handler_8(mon, args[0], args[1], args[2], args[3], args[4], args[5],
--
1.6.4.67.gea5b1
- [Qemu-devel] [PATCH 07/29] monitor: Setup a QDict with arguments to handlers, (continued)
- [Qemu-devel] [PATCH 07/29] monitor: Setup a QDict with arguments to handlers, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 08/29] monitor: Export QDict header, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 09/29] monitor: Port handler_0 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 10/29] monitor: Port handler_1 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 11/29] monitor: Port handler_2 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 12/29] monitor: Port handler_3 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 14/29] monitor: Port handler_5 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 15/29] monitor: Port handler_6 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 13/29] monitor: Port handler_4 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 17/29] monitor: Drop handler_8 and handler_9, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 19/29] monitor: Split monitor_handle_command(), Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 18/29] monitor: Port handler_10 to use QDict, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 20/29] monitor: Drop unused macros, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 21/29] monitor: Drop str_allocated[], Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 22/29] monitor: Drop args[] handling code, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 23/29] monitor: fail when 'i' type is greater than 32-bit, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 24/29] monitor: Update supported types documentation, Luiz Capitulino, 2009/08/19
- [Qemu-devel] [PATCH 25/29] Add check support, Luiz Capitulino, 2009/08/19