[v2,2/3] arm: qmp: add query-gic-capability interface

This implement the command "query-gic-capability" 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 <peterx@redhat.com>
---
 monitor.c            |  8 ++++++++
 qapi-schema.json     | 11 +++++++++++
 qmp-commands.hx      | 26 ++++++++++++++++++++++++++
 scripts/qapi.py      |  1 +
 target-arm/machine.c |  7 +++++++
 5 files changed, 53 insertions(+)

On Thu, Mar 03, 2016 at 04:21:11PM +0800, Peter Xu wrote:
> This implement the command "query-gic-capability" 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 <peterx@redhat.com>
> ---
>  monitor.c            |  8 ++++++++
>  qapi-schema.json     | 11 +++++++++++
>  qmp-commands.hx      | 26 ++++++++++++++++++++++++++
>  scripts/qapi.py      |  1 +
>  target-arm/machine.c |  7 +++++++
>  5 files changed, 53 insertions(+)
> 
> diff --git a/monitor.c b/monitor.c
> index 73eac17..3b34feb 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_capability(Error **errp)
> +{
> +    error_setg(errp, QERR_FEATURE_DISABLED, "query-gic-capability");
> +    return NULL;
> +}
> +#endif
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 0b2de6c..f42c8f7 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -4157,3 +4157,14 @@
>    'data': { 'version': 'int',
>              'emulated': 'bool',
>              'kernel': 'bool' } }
> +
> +##
> +# @query-gic-capability:
> +#
> +# Return a list of supported GIC version capabilities.
> +#
> +# Returns: a list of GICCapability.
> +#
> +# Since: 2.6
> +##
> +{ 'command': 'query-gic-capability', 'returns': ['GICCapability'] }
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index 13f158d..5e843f2 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-capability",
> +        .args_type  = "",
> +        .mhandler.cmd_new = qmp_marshal_query_gic_capability,
> +    },
> +#endif
> +
> +SQMP
> +query-gic-capability
> +---------------
> +
> +Return a list of supported ARM GIC versions and their capabilities.
> +
> +Arguments: None
> +
> +Example:
> +
> +-> { "execute": "query-gic-capability" }
> +<- { "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..b3fa64c 100644
> --- a/target-arm/machine.c
> +++ b/target-arm/machine.c
> @@ -345,3 +345,10 @@ const char *gicv3_class_name(void)
>  
>      exit(1);
>  }
> +
> +GICCapabilityList *qmp_query_gic_capability(Error **errp);

I don't know anything about QMP, so just offering a superficial
review comment. Is the prototype necessary here? It seems redundant,
considering the function is defined right below.

drew

> +
> +GICCapabilityList *qmp_query_gic_capability(Error **errp)
> +{
> +    return NULL;
> +}
> -- 
> 2.4.3
> 
>

On Thu, Mar 03, 2016 at 12:55:51PM +0100, Andrew Jones wrote:
> On Thu, Mar 03, 2016 at 04:21:11PM +0800, Peter Xu wrote:
> > +
> > +GICCapabilityList *qmp_query_gic_capability(Error **errp);
> 
> I don't know anything about QMP, so just offering a superficial
> review comment. Is the prototype necessary here? It seems redundant,
> considering the function is defined right below.
> 
> drew

I added this to avoid a "missing prototype" warning. However found
the correct way to do it is possibly to include "qmp-commands.h" in
target-arm/machine.c. Thanks to point out! Will fix.

Peter