From e2f9a6572bb400e64e7a56526c5f7a4a9f8f6f90 Mon Sep 17 00:00:00 2001 From: John Snow Date: Wed, 1 Jul 2015 14:25:49 -0400 Subject: [PATCH 1/2] qmp-shell: add documentation I should probably document the changes that were made. Signed-off-by: John Snow Message-Id: <1435775149-17285-1-git-send-email-jsnow@redhat.com> Reviewed-By: Kashyap Chamarthy Reviewed-by: Luiz Capitulino Signed-off-by: Markus Armbruster --- scripts/qmp/qmp-shell | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 65280d29d1..fa39bf0d7b 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -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 From 62313160cb5b6bdfbd77a063e94a5a7d25e59f2b Mon Sep 17 00:00:00 2001 From: Ting Wang Date: Fri, 26 Jun 2015 16:07:13 +0800 Subject: [PATCH 2/2] hmp: add info iothreads command Make "info iothreads" available on the HMP monitor. For example, the results are as follows when executing qemu command with "-object iothread,id=iothread-1 -object iothread,id=iothread-2". (qemu) info iothreads iothread-1: thread_id=123 iothread-2: thread_id=456 Signed-off-by: Ting Wang Message-Id: <1435306033-58372-1-git-send-email-kathy.wangting@huawei.com> Reviewed-by: Luiz Capitulino Reviewed-by: Amos Jianjun Kong Signed-off-by: Markus Armbruster --- hmp-commands.hx | 2 ++ hmp.c | 13 +++++++++++++ hmp.h | 1 + monitor.c | 7 +++++++ 4 files changed, 23 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index d6e81e4df3..286dcc75aa 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -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 diff --git a/hmp.c b/hmp.c index dcc66f159a..3f807b75f1 100644 --- a/hmp.c +++ b/hmp.c @@ -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"); diff --git a/hmp.h b/hmp.h index b8f5d33642..81656c3d82 100644 --- a/hmp.h +++ b/hmp.h @@ -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); diff --git a/monitor.c b/monitor.c index b1f2a29793..5455ab9de0 100644 --- a/monitor.c +++ b/monitor.c @@ -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",