From patchwork Fri Sep 25 14:03:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 522831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B27DD14027C for ; Sat, 26 Sep 2015 00:17:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=WSUrgobs; dkim-atps=neutral Received: from localhost ([::1]:42070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfToB-00021n-T6 for incoming@patchwork.ozlabs.org; Fri, 25 Sep 2015 10:17:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfTc5-0006x0-Fj for qemu-devel@nongnu.org; Fri, 25 Sep 2015 10:04:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZfTc1-0003c8-Km for qemu-devel@nongnu.org; Fri, 25 Sep 2015 10:04:37 -0400 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:33485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfTc1-0003bj-EK for qemu-devel@nongnu.org; Fri, 25 Sep 2015 10:04:33 -0400 Received: by wiclk2 with SMTP id lk2so23492323wic.0 for ; Fri, 25 Sep 2015 07:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Au7wOUkm+h6HQBQVx0jN2WFRJyQ6Uv/QuPJ4nUeH5s0=; b=WSUrgobsJi9UPTfeoW9Ovl29ywzcIz133d5ZMD1Mj2mKl1ZEbOVBF9pUoTz+ukROjD oGzJbAQDf4GOKR6K1tTRgFKuMW3lpaNuN8dH+i2dQ5/ThivdQ2oBjWWGhS6d7aSFlcA0 EOtyHnBKIWKY+QufTtFtkUygnrVnV7OiuXxdqjEXtQ6F2SS9C420iI/7aK+OWcOCaUP0 hDg2Y0tIffSO9P5yIO2C17g5h9eaNnnerMEjmlSMpvAQHh8+amNPENTz+bSlJL8v6IaA isQV1GjrKaim+4Lcxi50cNzGbp0W2CvaX34GDhvVmLjNiqjENCE1sQpcKWBmV0I0i8b2 EkEA== X-Received: by 10.194.114.199 with SMTP id ji7mr6133965wjb.19.1443189872902; Fri, 25 Sep 2015 07:04:32 -0700 (PDT) Received: from localhost ([149.6.167.210]) by smtp.gmail.com with ESMTPSA id jc9sm3442204wic.6.2015.09.25.07.04.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2015 07:04:31 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Fri, 25 Sep 2015 16:03:47 +0200 Message-Id: <1443189844-20341-20-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443189844-20341-1-git-send-email-marcandre.lureau@redhat.com> References: <1443189844-20341-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22a Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , armbru@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 19/36] qmp: implement qmp_query_commands without qmp_cmds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau So we can get rid of the static qmp_cmds table. Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake --- monitor.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index bfa0329..a2eb228 100644 --- a/monitor.c +++ b/monitor.c @@ -850,21 +850,24 @@ static void hmp_info_help(Monitor *mon, const QDict *qdict) help_cmd(mon, "info"); } -CommandInfoList *qmp_query_commands(Error **errp) +static void query_commands_cb(QmpCommand *cmd, void *opaque) { - CommandInfoList *info, *cmd_list = NULL; - const mon_cmd_t *cmd; + CommandInfoList *info, **list = opaque; - for (cmd = qmp_cmds; cmd->name != NULL; cmd++) { - info = g_malloc0(sizeof(*info)); - info->value = g_malloc0(sizeof(*info->value)); - info->value->name = g_strdup(cmd->name); + info = g_malloc0(sizeof(*info)); + info->value = g_malloc0(sizeof(*info->value)); + info->value->name = g_strdup(cmd->name); + info->next = *list; + *list = info; +} - info->next = cmd_list; - cmd_list = info; - } +CommandInfoList *qmp_query_commands(Error **errp) +{ + CommandInfoList *list = NULL; + + qmp_for_each_command(query_commands_cb, &list); - return cmd_list; + return list; } EventInfoList *qmp_query_events(Error **errp)