Definitely 2.11 material now. v4 is a rather big overhaul of what has been previously posted, rebasing things to make it easier to pass the command name separately from the args when calling qmp() derivatives in the testsuite, and adding support for %% handling to make -Wformat checking more robust.
Also available as a tag at: git fetch git://repo.or.cz/qemu/ericb.git qapi-qmp-cleanup-v4 Diffstat since v3: 001/22:[0011] [FC] 'qobject: Accept "%"PRId64 in qobject_from_jsonf()' 002/22:[----] [--] 'tests: Clean up wait for event' 003/22:[----] [--] 'tests/libqtest: Clean up how we read the QMP greeting' 004/22:[down] 'tests: Add assertion for no qmp("")' 005/22:[down] 'qobject: Simplify qobject_from_jsonv()' 006/22:[down] 'qobject: Perform %% interpolation in qobject_from_jsonf()' 007/22:[down] 'numa-test: Use hmp()' 008/22:[----] [--] 'qtest: Avoid passing raw strings through hmp()' 009/22:[0022] [FC] 'qtest: Document calling conventions' 010/22:[down] 'libqtest: Skip round-trip through QObject' 011/22:[down] 'test-qga: Simplify command construction' 012/22:[down] 'libqtest: Change qmp_fd_send() to drop varargs' 013/22:[down] 'libqtest: Add qmp_raw()' 014/22:[down] 'libqtest: Separate qmp_discard_response() from command' 015/22:[down] 'libqtest: Delete qtest_qmp() wrappers' 016/22:[down] 'libqtest: Add qmp_cmd() helper' 017/22:[down] 'libqtest: Add qmp_args() helper' 018/22:[0014] [FC] 'tests/libqos/usb: Clean up string interpolation into QMP input' 019/22:[down] 'libqtest: Add qmp_args_dict() helper' 020/22:[0004] [FC] 'tests/libqos/pci: Clean up string interpolation into QMP input' 021/22:[down] 'libqtest: Drop now-unused qmp()' 022/22:[down] 'libqtest: Rename qmp_cmd() to qmp()' Eric Blake (18): qobject: Accept "%"PRId64 in qobject_from_jsonf() tests: Add assertion for no qmp("") qobject: Simplify qobject_from_jsonv() qobject: Perform %% interpolation in qobject_from_jsonf() numa-test: Use hmp() qtest: Avoid passing raw strings through hmp() qtest: Document calling conventions libqtest: Skip round-trip through QObject test-qga: Simplify command construction libqtest: Change qmp_fd_send() to drop varargs libqtest: Add qmp_raw() libqtest: Separate qmp_discard_response() from command libqtest: Delete qtest_qmp() wrappers libqtest: Add qmp_cmd() helper libqtest: Add qmp_args() helper libqtest: Add qmp_args_dict() helper libqtest: Drop now-unused qmp() libqtest: Rename qmp_cmd() to qmp() Markus Armbruster (4): tests: Clean up wait for event tests/libqtest: Clean up how we read the QMP greeting tests/libqos/usb: Clean up string interpolation into QMP input tests/libqos/pci: Clean up string interpolation into QMP input configure | 24 ++++ include/qapi/qmp/qjson.h | 2 +- tests/libqos/pci.h | 2 +- tests/libqtest.h | 163 +++++++++++--------------- tests/libqtest.c | 234 ++++++++++++++----------------------- qobject/json-lexer.c | 24 ++-- qobject/json-parser.c | 59 +++++----- qobject/qjson.c | 49 +++++++- tests/ahci-test.c | 29 ++--- tests/boot-order-test.c | 4 +- tests/check-qjson.c | 57 +++++++++ tests/device-introspect-test.c | 7 +- tests/drive_del-test.c | 11 +- tests/fdc-test.c | 11 +- tests/ide-test.c | 5 +- tests/ivshmem-test.c | 10 +- tests/libqos/ahci.c | 4 +- tests/libqos/libqos.c | 23 +--- tests/libqos/pci-pc.c | 14 +-- tests/libqos/pci.c | 32 ++--- tests/libqos/usb.c | 26 ++--- tests/numa-test.c | 23 +--- tests/pc-cpu-test.c | 8 +- tests/postcopy-test.c | 41 +++---- tests/q35-test.c | 2 +- tests/qmp-test.c | 27 +++-- tests/qom-test.c | 11 +- tests/tco-test.c | 3 +- tests/test-filter-mirror.c | 3 +- tests/test-filter-redirector.c | 6 +- tests/test-hmp.c | 4 +- tests/test-netfilter.c | 139 +++++++++------------- tests/test-qga.c | 220 +++++++++++++++++----------------- tests/test-qobject-input-visitor.c | 18 +-- tests/test-x86-cpuid-compat.c | 8 +- tests/tmp105-test.c | 9 +- tests/usb-hcd-uhci-test.c | 20 +--- tests/usb-hcd-xhci-test.c | 37 ++---- tests/vhost-user-test.c | 12 +- tests/virtio-blk-test.c | 20 ++-- tests/virtio-net-test.c | 13 +-- tests/virtio-scsi-test.c | 13 +-- tests/virtio-serial-test.c | 12 +- tests/vmgenid-test.c | 2 +- tests/wdt_ib700-test.c | 37 ++---- 45 files changed, 678 insertions(+), 800 deletions(-) -- 2.13.3