From patchwork Tue Mar 8 07:36:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 8530141 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A79119F46A for ; Tue, 8 Mar 2016 07:37:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07A042017D for ; Tue, 8 Mar 2016 07:37:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DCC3200FE for ; Tue, 8 Mar 2016 07:37:14 +0000 (UTC) Received: from localhost ([::1]:60951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adCCf-0006CW-Lb for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 Mar 2016 02:37:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adCCU-000685-VT for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:37:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adCCQ-0005To-UE for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:37:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adCCO-0005Qv-E4; Tue, 08 Mar 2016 02:36:56 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 0E760C000716; Tue, 8 Mar 2016 07:36:56 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-5-232.pek2.redhat.com [10.72.5.232]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u287aSmH024053; Tue, 8 Mar 2016 02:36:47 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Tue, 8 Mar 2016 15:36:21 +0800 Message-Id: <1457422582-28799-3-git-send-email-peterx@redhat.com> In-Reply-To: <1457422582-28799-1-git-send-email-peterx@redhat.com> References: <1457422582-28799-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: wei@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com, peterx@redhat.com, abologna@redhat.com, qemu-arm@nongnu.org Subject: [Qemu-devel] [PATCH v4 2/3] arm: qmp: add query-gic-capabilities interface 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds the command "query-gic-capabilities" but not implemnet it. The command is ARM-only. Return of the command is a list of GICCapability struct that describes all GIC versions that current QEMU and system support. Signed-off-by: Peter Xu --- monitor.c | 8 ++++++++ qapi-schema.json | 11 +++++++++++ qmp-commands.hx | 26 ++++++++++++++++++++++++++ scripts/qapi.py | 1 + target-arm/machine.c | 6 ++++++ 5 files changed, 52 insertions(+) diff --git a/monitor.c b/monitor.c index 73eac17..9e8cbdb 100644 --- a/monitor.c +++ b/monitor.c @@ -4241,3 +4241,11 @@ void qmp_dump_skeys(const char *filename, Error **errp) error_setg(errp, QERR_FEATURE_DISABLED, "dump-skeys"); } #endif + +#ifndef TARGET_ARM +GICCapabilityList *qmp_query_gic_capabilities(Error **errp) +{ + error_setg(errp, QERR_FEATURE_DISABLED, "query-gic-capabilities"); + return NULL; +} +#endif diff --git a/qapi-schema.json b/qapi-schema.json index 0b2de6c..9c0a503 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4157,3 +4157,14 @@ 'data': { 'version': 'int', 'emulated': 'bool', 'kernel': 'bool' } } + +## +# @query-gic-capabilities: +# +# Return a list of supported GIC version capabilities. +# +# Returns: a list of GICCapability. +# +# Since: 2.6 +## +{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] } diff --git a/qmp-commands.hx b/qmp-commands.hx index 13f158d..c003838 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4852,3 +4852,29 @@ Example: {"type": 0, "out-pport": 0, "pport": 0, "vlan-id": 3840, "pop-vlan": 1, "id": 251658240} ]} + +EQMP + +#if defined TARGET_ARM + { + .name = "query-gic-capabilities", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_query_gic_capabilities, + }, +#endif + +SQMP +query-gic-capabilities +--------------- + +Return a list of supported ARM GIC versions and their capabilities. + +Arguments: None + +Example: + +-> { "execute": "query-gic-capabilities" } +<- { "return": [{ "version": 2, "emulated": true, "kernel": false }, + { "version": 3, "emulated": false, "kernel": true } ] } + +EQMP diff --git a/scripts/qapi.py b/scripts/qapi.py index 8497777..9dc8f73 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -46,6 +46,7 @@ returns_whitelist = [ 'query-tpm-models', 'query-tpm-types', 'ringbuf-read', + 'query-gic-capability', # From QGA: 'guest-file-open', diff --git a/target-arm/machine.c b/target-arm/machine.c index 03a73d9..813909e 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -5,6 +5,7 @@ #include "sysemu/kvm.h" #include "kvm_arm.h" #include "internals.h" +#include "qmp-commands.h" static bool vfp_needed(void *opaque) { @@ -345,3 +346,8 @@ const char *gicv3_class_name(void) exit(1); } + +GICCapabilityList *qmp_query_gic_capabilities(Error **errp) +{ + return NULL; +}