From patchwork Wed Aug 26 17:05:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 32178 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 93E29B7093 for ; Thu, 27 Aug 2009 03:50:29 +1000 (EST) Received: from localhost ([127.0.0.1]:35929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgMdW-0002H6-AO for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2009 13:50:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgLxG-0003HP-2L for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:06:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgLxA-00038p-CQ for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:06:36 -0400 Received: from [199.232.76.173] (port=45804 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgLxA-00038O-5k for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:06:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37638) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgLx9-0000hZ-By for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:06:31 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7QH6UXH031762; Wed, 26 Aug 2009 13:06:30 -0400 Received: from localhost (vpn-10-90.bos.redhat.com [10.16.10.90]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7QH6Swp009337; Wed, 26 Aug 2009 13:06:29 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 26 Aug 2009 14:05:30 -0300 Message-Id: <1251306352-31316-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1251306352-31316-1-git-send-email-lcapitulino@redhat.com> References: <1251306352-31316-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 07/29] monitor: Setup a QDict with arguments to handlers 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 With this commit monitor_handle_command() will be able to setup a QDict with arguments to command handlers. However, the current 'args[]' method is still being used, next changes will port commands to get their arguments from the dictionary. Two changes are worth noting: 1. The '/' argument type always adds the following standard keys in the dictionary: 'count', 'format' and 'size'. This way, the argument name used in the 'args_type' string doesn't matter 2. The optional argument type '?' doesn't need to pass the additional 'has_arg' argument, hanlders can do the same check with qdict_haskey() Signed-off-by: Luiz Capitulino --- monitor.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 22b3b04..b1a79bd 100644 --- a/monitor.c +++ b/monitor.c @@ -44,6 +44,9 @@ #include "migration.h" #include "kvm.h" #include "acl.h" +#include "qint.h" +#include "qdict.h" +#include "qstring.h" //#define DEBUG //#define DEBUG_COMPLETION @@ -2538,6 +2541,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) char cmdname[256]; char buf[1024]; char *key; + QDict *qdict; void *str_allocated[MAX_ARGS]; void *args[MAX_ARGS]; void (*handler_0)(Monitor *mon); @@ -2582,6 +2586,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) return; } + qdict = qdict_new(); + for(i = 0; i < MAX_ARGS; i++) str_allocated[i] = NULL; @@ -2639,6 +2645,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) goto fail; } args[nb_args++] = str; + if (str) + qdict_put(qdict, key, qstring_from_str(str)); } break; case '/': @@ -2720,12 +2728,16 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) args[nb_args++] = (void*)(long)count; args[nb_args++] = (void*)(long)format; args[nb_args++] = (void*)(long)size; + qdict_put(qdict, "count", qint_from_int(count)); + qdict_put(qdict, "format", qint_from_int(format)); + qdict_put(qdict, "size", qint_from_int(size)); } break; case 'i': case 'l': { int64_t val; + int dict_add = 1; while (qemu_isspace(*p)) p++; @@ -2748,6 +2760,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) typestr++; if (nb_args >= MAX_ARGS) goto error_args; + dict_add = has_arg; args[nb_args++] = (void *)(long)has_arg; if (!has_arg) { if (nb_args >= MAX_ARGS) @@ -2763,6 +2776,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) if (nb_args >= MAX_ARGS) goto error_args; args[nb_args++] = (void *)(long)val; + if (dict_add) + qdict_put(qdict, key, qint_from_int(val)); } else { if ((nb_args + 1) >= MAX_ARGS) goto error_args; @@ -2772,6 +2787,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) args[nb_args++] = (void *)0; #endif args[nb_args++] = (void *)(long)(val & 0xffffffff); + qdict_put(qdict, key, qint_from_int(val)); } } break; @@ -2799,6 +2815,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) if (nb_args >= MAX_ARGS) goto error_args; args[nb_args++] = (void *)(long)has_option; + qdict_put(qdict, key, qint_from_int(has_option)); } break; default: @@ -2875,6 +2892,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) qemu_free(key); for(i = 0; i < MAX_ARGS; i++) qemu_free(str_allocated[i]); + QDECREF(qdict); } static void cmd_completion(const char *name, const char *list)