I've merged the best aspects of Markus' and my previous posts on the topic. While it mostly touches test code (and thus could be considered 2.10 material at a stretch), it's a big enough series that it's probably safer to leave for 2.11.
If you like the idea of qmp_cmd() taking a command name and a QObject (easier than QDict) for arguments, there may be more places to clean up to use that paradigm (for this round of posting, I focused more on cleaning up the areas touched in earlier patches, rather than a global search). Eric Blake (5): qobject: Accept "%"PRId64 in qobject_from_jsonf() qtest: Avoid passing raw strings through hmp() qtest: Document calling conventions qtest: Add a new helper qmp_cmd() and friends qtests: convert tests to use qmp_cmd Markus Armbruster (7): tests: Pass literal format strings directly to qmp_FOO() tests: Clean up string interpolation into QMP input (simple cases) tests/libqos/usb: Clean up string interpolation into QMP input tests/libqos/pci: Clean up string interpolation into QMP input tests: Clean up wait for event tests/libqtest: Clean up how we read the QMP greeting tests/libqtest: Enable compile-time format string checking configure | 24 +++++++ tests/libqos/pci.h | 2 +- tests/libqtest.h | 103 ++++++++++++++++++-------- qobject/json-lexer.c | 21 +++--- qobject/json-parser.c | 10 +-- tests/ahci-test.c | 4 +- tests/boot-order-test.c | 2 +- tests/check-qjson.c | 7 ++ tests/device-introspect-test.c | 3 +- tests/ide-test.c | 4 +- tests/ivshmem-test.c | 10 +-- tests/libqos/libqos.c | 17 +---- tests/libqos/pci-pc.c | 15 +--- tests/libqos/pci.c | 32 +++++---- tests/libqos/usb.c | 30 ++++---- tests/libqtest.c | 29 +++++++- tests/pc-cpu-test.c | 10 +-- tests/postcopy-test.c | 15 ++-- tests/tco-test.c | 3 +- tests/test-hmp.c | 4 +- tests/test-qga.c | 160 ++++++++++++++++++----------------------- tests/usb-hcd-uhci-test.c | 6 +- tests/usb-hcd-xhci-test.c | 12 +--- tests/vhost-user-test.c | 16 ++--- tests/virtio-blk-test.c | 5 +- tests/wdt_ib700-test.c | 35 +++------ 26 files changed, 303 insertions(+), 276 deletions(-) -- 2.13.3