On Sat, 1 Feb 2014 12:52:42 +0100
Martin Kletzander <mklet...@redhat.com> wrote:
> Introduce 'query-chardev-backends' QMP command which lists all
> supported character device backends.
>
> Signed-off-by: Martin Kletzander <mklet...@redhat.com>
> ---
> v3:
> - Omit commas at the end of list in JSON
> v2:
> - Version changed from "1.8.0" to "2.0"
>
> qapi-schema.json | 22 ++++++++++++++++++++++
> qemu-char.c | 19 +++++++++++++++++++
> qmp-commands.hx | 41 +++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 82 insertions(+)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 05ced9d..ebd278a 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -437,6 +437,28 @@
> { 'command': 'query-chardev', 'returns': ['ChardevInfo'] }
>
> ##
> +# @ChardevBackendInfo:
> +#
> +# Information about a character device backend
> +#
> +# @name: The backend name
> +#
> +# Since: 2.0
> +##
> +{ 'type': 'ChardevBackendInfo', 'data': {'name': 'str'} }
We already have ChardevBackend, it's an union though. I'm wondering if
you could change it to an enum and use it instead of plain 'str'?
> +
> +##
> +# @query-chardev-backends:
> +#
> +# Returns information about character device backends.
Actually, it returns information about registered backends (registration
is done by register_char_driver_qapi(). So, I think it's good thing to
mention that this list is about available backends.
> +#
> +# Returns: a list of @ChardevBackendInfo
> +#
> +# Since: 2.0
> +##
> +{ 'command': 'query-chardev-backends', 'returns': ['ChardevBackendInfo'] }
> +
> +##
> # @DataFormat:
> #
> # An enumeration of data format.
> diff --git a/qemu-char.c b/qemu-char.c
> index 30c5a6a..c88f1c4 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -3432,6 +3432,25 @@ ChardevInfoList *qmp_query_chardev(Error **errp)
> return chr_list;
> }
>
> +ChardevBackendInfoList *qmp_query_chardev_backends(Error **errp)
> +{
> + ChardevBackendInfoList *backend_list = NULL;
> + CharDriver *c = NULL;
> + GSList *i = NULL;
> +
> + for (i = backends; i; i = i->next) {
> + ChardevBackendInfoList *info = g_malloc0(sizeof(*info));
> + c = i->data;
> + info->value = g_malloc0(sizeof(*info->value));
> + info->value->name = g_strdup(c->name);
> +
> + info->next = backend_list;
> + backend_list = info;
> + }
> +
> + return backend_list;
> +}
> +
> CharDriverState *qemu_chr_find(const char *name)
> {
> CharDriverState *chr;
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index cce6b81..8a0e832 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -1924,6 +1924,47 @@ EQMP
> },
>
> SQMP
> +query-chardev-backends
> +-------------
> +
> +List available character device backends.
> +
> +Each backend is represented by a json-object, the returned value is a
> json-array
> +of all backends.
> +
> +Each json-object contains:
> +
> +- "name": backend name (json-string)
> +
> +Example:
> +
> +-> { "execute": "query-chardev-backends" }
> +<- {
> + "return":[
> + {
> + "name":"udp"
> + },
> + {
> + "name":"tcp"
> + },
> + {
> + "name":"unix"
> + },
> + {
> + "name":"spiceport"
> + }
> + ]
> + }
> +
> +EQMP
> +
> + {
> + .name = "query-chardev-backends",
> + .args_type = "",
> + .mhandler.cmd_new = qmp_marshal_input_query_chardev_backends,
> + },
> +
> +SQMP
> query-block
> -----------
>
> --
> 1.8.5.3
>
