From patchwork Tue Oct 8 06:23:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wu X-Patchwork-Id: 281332 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EEDEE2C009A for ; Tue, 8 Oct 2013 17:24:12 +1100 (EST) Received: from localhost ([::1]:34850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTQiJ-0001W2-0x for incoming@patchwork.ozlabs.org; Tue, 08 Oct 2013 02:24:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTQhn-0001PZ-Tb for qemu-devel@nongnu.org; Tue, 08 Oct 2013 02:23:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTQhe-00052K-Ub for qemu-devel@nongnu.org; Tue, 08 Oct 2013 02:23:39 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:33982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTQhe-000520-8B for qemu-devel@nongnu.org; Tue, 08 Oct 2013 02:23:30 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Oct 2013 11:53:27 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 8 Oct 2013 11:53:25 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id C4C9AE0055 for ; Tue, 8 Oct 2013 11:54:41 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r986PvCZ35324148 for ; Tue, 8 Oct 2013 11:55:57 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r986NNOM018112 for ; Tue, 8 Oct 2013 11:53:23 +0530 Received: from localhost.cn.ibm.com ([9.115.126.172]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r986NLF8018004; Tue, 8 Oct 2013 11:53:22 +0530 From: Mark Wu To: Qemu-devel@nongnu.org Date: Tue, 8 Oct 2013 14:23:19 +0800 Message-Id: <1381213399-11487-1-git-send-email-wudxw@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.3.1 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13100806-3864-0000-0000-00000A6DECC3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.3 Cc: Mark Wu , Michael Roth , Luiz Capitulino Subject: [Qemu-devel] [PATCH v4] Extend qemu-ga's 'guest-info' command to expose flag 'success-response' 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 Now we have several qemu-ga commands not returning response on success. It has been documented in qga/qapi-schema.json already. This patch exposes the 'success-response' flag by extending 'guest-info' command. With this change, the clients can handle the command response more flexibly. Signed-off-by: Mark Wu Reviewed-by: Eric Blake Reviewed-by: Michael Roth --- Changes: v4: Add signature of qmp_has_success_response per Michael. v3: 1. treat cmd->options as a bitmask instead of single option (per Eric) 2. rebase on the patch " Add interface to traverse the qmp command list by QmpCommand" to avoid the O(n2) problem (per Eric and Michael) v2: add the notation 'since 1.7' to the option 'success-response' (per Eric Blake's comments) include/qapi/qmp/dispatch.h | 1 + qapi/qmp-registry.c | 5 +++++ qga/commands.c | 1 + qga/qapi-schema.json | 5 ++++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index b6eb49e..cebf6aa 100644 --- a/include/qapi/qmp/dispatch.h +++ b/include/qapi/qmp/dispatch.h @@ -48,6 +48,7 @@ QObject *qmp_dispatch(QObject *request); void qmp_disable_command(const char *name); void qmp_enable_command(const char *name); bool qmp_command_is_enabled(const QmpCommand *cmd); +bool qmp_has_success_response(const QmpCommand *cmd); QObject *qmp_build_error_object(Error *errp); typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque); void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque); diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c index 3fcf10e..c75c2e8 100644 --- a/qapi/qmp-registry.c +++ b/qapi/qmp-registry.c @@ -71,6 +71,11 @@ bool qmp_command_is_enabled(const QmpCommand *cmd) return cmd->enabled; } +bool qmp_has_success_response(const QmpCommand *cmd) +{ + return !(cmd->options & QCO_NO_SUCCESS_RESP); +} + void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque) { QmpCommand *cmd; diff --git a/qga/commands.c b/qga/commands.c index 063b22b..7f089ba 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -54,6 +54,7 @@ static void qmp_command_info(QmpCommand *cmd, void *opaque) cmd_info = g_malloc0(sizeof(GuestAgentCommandInfo)); cmd_info->name = g_strdup(cmd->name); cmd_info->enabled = qmp_command_is_enabled(cmd); + cmd_info->success_response = qmp_has_success_response(cmd); cmd_info_list = g_malloc0(sizeof(GuestAgentCommandInfoList)); cmd_info_list->value = cmd_info; diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 7155b7a..245f968 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -141,10 +141,13 @@ # # @enabled: whether command is currently enabled by guest admin # +# @success-response: whether command returns a response on success +# (since 1.7) +# # Since 1.1.0 ## { 'type': 'GuestAgentCommandInfo', - 'data': { 'name': 'str', 'enabled': 'bool' } } + 'data': { 'name': 'str', 'enabled': 'bool', 'success-response': 'bool' } } ## # @GuestAgentInfo