From patchwork Fri Aug 28 18:27:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 32420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 26680B7B61 for ; Sat, 29 Aug 2009 05:03:02 +1000 (EST) Received: from localhost ([127.0.0.1]:42735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh6iw-00077B-IZ for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 15:02:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh6Bh-0007jP-E2 for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh6Bd-0007hl-Pk for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:37 -0400 Received: from [199.232.76.173] (port=41302 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh6Bd-0007hD-Gf for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21403) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh6Bc-00038E-Vs for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:33 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SISWCr017678; Fri, 28 Aug 2009 14:28:32 -0400 Received: from localhost (vpn-10-114.bos.redhat.com [10.16.10.114]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7SISUfD007458; Fri, 28 Aug 2009 14:28:31 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 15:27:19 -0300 Message-Id: <1251484052-3939-17-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1251484052-3939-1-git-send-email-lcapitulino@redhat.com> References: <1251484052-3939-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This commit ports command handlers that receive seven arguments to use the new monitor's dictionary. Signed-off-by: Luiz Capitulino --- monitor.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/monitor.c b/monitor.c index 4947ef1..2510204 100644 --- a/monitor.c +++ b/monitor.c @@ -1515,11 +1515,15 @@ 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_haskey(qdict, "freq"); + int freq = qdict_get_try_int(qdict, "freq", -1); + int has_bits = qdict_haskey(qdict, "bits"); + int bits = qdict_get_try_int(qdict, "bits", -1); + int has_channels = qdict_haskey(qdict, "nchannels"); + int nchannels = qdict_get_try_int(qdict, "nchannels", -1); CaptureState *s; s = qemu_mallocz (sizeof (*s)); @@ -2601,8 +2605,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); @@ -2891,14 +2893,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],