Commit 5fc00480 authored by Pavel Hrdina's avatar Pavel Hrdina Committed by Dr. David Alan Gilbert
Browse files

monitor: add poll-* properties into query-iothreads result 



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: default avatarPavel Hrdina <phrdina@redhat.com>
Message-Id: <3163c16d6ab4257f7be9ad44fe9cc0ce8c359e5a.1486718555.git.phrdina@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 3f35c3b1

hmp.c

+7 −2
Original line number Diff line number Diff line
@@ -2149,10 +2149,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);

iothread.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

qapi-schema.json

+14 −1
Original line number Diff line number Diff line
@@ -1427,10 +1427,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: