From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MduHU-0002H6-Oi for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MduHQ-0002Be-8N for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:24 -0400 Received: from [199.232.76.173] (port=49899 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MduHP-0002B8-TH for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16814) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MduHP-0005Xn-9o for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:19 -0400 From: Luiz Capitulino Date: Wed, 19 Aug 2009 20:07:47 -0300 Message-Id: <1250723280-3509-17-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> References: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, avi@redhat.com This commit ports command handlers that receive seven arguments to use the new monitor's dictionary. Signed-off-by: Luiz Capitulino --- 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