Commit b597aa03 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-09-04' into staging 



Monitor patches

# gpg: Signature made Fri 04 Sep 2015 12:40:11 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-monitor-2015-09-04:
  hmp: add info iothreads command
  qmp-shell: add documentation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b5bff751 62313160

hmp-commands.hx

+2 −0
Original line number Diff line number Diff line
@@ -1809,6 +1809,8 @@ show the TPM device 
show the memory devices

@item info skeys

Display the value of a storage key (s390 only)

@item info iothreads

show iothreads

@end table

ETEXI

hmp.c

+13 −0
Original line number Diff line number Diff line
@@ -1963,6 +1963,19 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) 
    qapi_free_MemoryDeviceInfoList(info_list);

}



void hmp_info_iothreads(Monitor *mon, const QDict *qdict)

{

    IOThreadInfoList *info_list = qmp_query_iothreads(NULL);

    IOThreadInfoList *info;



    for (info = info_list; info; info = info->next) {

        monitor_printf(mon, "%s: thread_id=%" PRId64 "\n",

                       info->value->id, info->value->thread_id);

    }



    qapi_free_IOThreadInfoList(info_list);

}



void hmp_qom_list(Monitor *mon, const QDict *qdict)

{

    const char *path = qdict_get_try_str(qdict, "path");

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict); 
void hmp_info_pci(Monitor *mon, const QDict *qdict);

void hmp_info_block_jobs(Monitor *mon, const QDict *qdict);

void hmp_info_tpm(Monitor *mon, const QDict *qdict);

void hmp_info_iothreads(Monitor *mon, const QDict *qdict);

void hmp_quit(Monitor *mon, const QDict *qdict);

void hmp_stop(Monitor *mon, const QDict *qdict);

void hmp_system_reset(Monitor *mon, const QDict *qdict);

monitor.c

+7 −0
Original line number Diff line number Diff line
@@ -2853,6 +2853,13 @@ static mon_cmd_t info_cmds[] = { 
        .help       = "show memory devices",

        .mhandler.cmd = hmp_info_memory_devices,

    },

    {

        .name       = "iothreads",

        .args_type  = "",

        .params     = "",

        .help       = "show iothreads",

        .mhandler.cmd = hmp_info_iothreads,

    },

    {

        .name       = "rocker",

        .args_type  = "name:s",

scripts/qmp/qmp-shell

+35 −0
Original line number Diff line number Diff line
@@ -29,6 +29,41 @@ 
# (QEMU) device_add driver=e1000 id=net1

# {u'return': {}}

# (QEMU)

#

# key=value pairs also support Python or JSON object literal subset notations,

# without spaces. Dictionaries/objects {} are supported as are arrays [].

#

#    example-command arg-name1={'key':'value','obj'={'prop':"value"}}

#

# Both JSON and Python formatting should work, including both styles of

# string literal quotes. Both paradigms of literal values should work,

# including null/true/false for JSON and None/True/False for Python.

#

#

# Transactions have the following multi-line format:

#

#    transaction(

#    action-name1 [ arg-name1=arg1 ] ... [arg-nameN=argN ]

#    ...

#    action-nameN [ arg-name1=arg1 ] ... [arg-nameN=argN ]

#    )

#

# One line transactions are also supported:

#

#    transaction( action-name1 ... )

#

# For example:

#

#     (QEMU) transaction(

#     TRANS> block-dirty-bitmap-add node=drive0 name=bitmap1

#     TRANS> block-dirty-bitmap-clear node=drive0 name=bitmap0

#     TRANS> )

#     {"return": {}}

#     (QEMU)

#

# Use the -v and -p options to activate the verbose and pretty-print options,

# which will echo back the properly formatted JSON-compliant QMP that is being

# sent to QEMU, which is useful for debugging and documentation generation.



import qmp

import json