Re: [Qemu-devel] [PATCH] monitor: add poll-* properties into query-iothreads result

[Dr. David Alan Gilbert]

* Pavel Hrdina (address@hidden) wrote:
> IOthreads were recently extended by new properties that can
> enable/disable and configure aio polling.  This will also allow
> other tools that uses QEMU to probe for existence of those new
> properties via query-qmp-schema.
> 
> Signed-off-by: Pavel Hrdina <address@hidden>

Queued for HMP

> ---
> 
> The other possible way would be to introduce object-list-properties
> which I think would be good in general for the same reason why
> device-list-properties exists.
> 
>  hmp.c            |  9 +++++++--
>  iothread.c       |  3 +++
>  qapi-schema.json | 15 ++++++++++++++-
>  3 files changed, 24 insertions(+), 3 deletions(-)
> 
> diff --git a/hmp.c b/hmp.c
> index 2bc4f062bb..d713151cbc 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -2148,10 +2148,15 @@ void hmp_info_iothreads(Monitor *mon, const QDict 
> *qdict)
>  {
>      IOThreadInfoList *info_list = qmp_query_iothreads(NULL);
>      IOThreadInfoList *info;
> +    IOThreadInfo *value;
>  
>      for (info = info_list; info; info = info->next) {
> -        monitor_printf(mon, "%s: thread_id=%" PRId64 "\n",
> -                       info->value->id, info->value->thread_id);
> +        value = info->value;
> +        monitor_printf(mon, "%s:\n", value->id);
> +        monitor_printf(mon, "  thread_id=%" PRId64 "\n", value->thread_id);
> +        monitor_printf(mon, "  poll-max-ns=%" PRId64 "\n", 
> value->poll_max_ns);
> +        monitor_printf(mon, "  poll-grow=%" PRId64 "\n", value->poll_grow);
> +        monitor_printf(mon, "  poll-shrink=%" PRId64 "\n", 
> value->poll_shrink);
>      }
>  
>      qapi_free_IOThreadInfoList(info_list);
> diff --git a/iothread.c b/iothread.c
> index 257b01d5f1..beeb870534 100644
> --- a/iothread.c
> +++ b/iothread.c
> @@ -268,6 +268,9 @@ static int query_one_iothread(Object *object, void 
> *opaque)
>      info = g_new0(IOThreadInfo, 1);
>      info->id = iothread_get_id(iothread);
>      info->thread_id = iothread->thread_id;
> +    info->poll_max_ns = iothread->poll_max_ns;
> +    info->poll_grow = iothread->poll_grow;
> +    info->poll_shrink = iothread->poll_shrink;
>  
>      elem = g_new0(IOThreadInfoList, 1);
>      elem->value = info;
> diff --git a/qapi-schema.json b/qapi-schema.json
> index cbdffddbc6..a97a054c81 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -1422,10 +1422,23 @@
>  #
>  # @thread-id: ID of the underlying host thread
>  #
> +# @poll-max-ns: maximum polling time in ns, 0 means polling is disabled
> +#               (since 2.9)
> +#
> +# @poll-grow: how many ns will be added to polling time, 0 means that it's 
> not
> +#             configured (since 2.9)
> +#
> +# @poll-shrink: how many ns will be removed from polling time, 0 means that
> +#               it's not configured (since 2.9)
> +#
>  # Since: 2.0
>  ##
>  { 'struct': 'IOThreadInfo',
> -  'data': {'id': 'str', 'thread-id': 'int'} }
> +  'data': {'id': 'str',
> +           'thread-id': 'int',
> +           'poll-max-ns': 'int',
> +           'poll-grow': 'int',
> +           'poll-shrink': 'int' } }
>  
>  ##
>  # @query-iothreads:
> -- 
> 2.11.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK