This is a subset of my earlier post "Rip out dynamic JSON parsing"[1], hence the v2 marking. It focuses only on the patches that are worth having whether or not we decide that ripping out dynamic JSON is the way to go (code cleanups and testsuite improvements). I've rebased it to the current master.
We may still want patch 2 to be subdivided. [1] https://lists.gnu.org/archive/html/qemu-devel/2016-11/msg05425.html 001/6:[----] [--] 'pci: Use struct instead of QDict to pass back parameters' 002/6:[0028] [FC] 'qdict: Add convenience helpers for wrapped puts' 003/6:[----] [--] 'qlist: Add convenience helpers for wrapped appends' 004/6:[----] [--] 'fdc-test: Avoid deprecated 'change' command' 005/6:[----] [--] 'test-qga: Actually test 0xff sync bytes' 006/6:[----] [-C] 'qapi: Promote blockdev-change-medium arguments to QAPI type' Eric Blake (6): pci: Use struct instead of QDict to pass back parameters qdict: Add convenience helpers for wrapped puts qlist: Add convenience helpers for wrapped appends fdc-test: Avoid deprecated 'change' command test-qga: Actually test 0xff sync bytes qapi: Promote blockdev-change-medium arguments to QAPI type qapi/block-core.json | 11 ++- include/qapi/qmp/qdict.h | 8 ++ include/qapi/qmp/qlist.h | 8 ++ block.c | 59 ++++++--------- block/archipelago.c | 4 +- block/blkdebug.c | 6 +- block/blkverify.c | 11 ++- block/curl.c | 2 +- block/file-posix.c | 8 +- block/file-win32.c | 4 +- block/iscsi.c | 2 +- block/nbd.c | 41 +++++------ block/nfs.c | 43 +++++------ block/null.c | 2 +- block/qcow2.c | 4 +- block/quorum.c | 13 ++-- block/ssh.c | 16 ++-- block/vvfat.c | 10 +-- blockdev.c | 28 +++---- hw/block/xen_disk.c | 2 +- hw/pci/pcie_aer.c | 36 +++++---- hw/usb/xen-usb.c | 12 +-- monitor.c | 18 ++--- qapi/qmp-event.c | 2 +- qemu-img.c | 6 +- qemu-io.c | 2 +- qemu-nbd.c | 2 +- qobject/qdict.c | 2 +- target/s390x/cpu_models.c | 4 +- tests/check-qdict.c | 142 ++++++++++++++++++------------------ tests/check-qlist.c | 2 +- tests/fdc-test.c | 5 +- tests/libqtest.c | 8 ++ tests/test-qga.c | 12 +-- tests/test-qmp-commands.c | 30 ++++---- tests/test-qmp-event.c | 30 ++++---- tests/test-qobject-output-visitor.c | 6 +- util/qemu-option.c | 6 +- 38 files changed, 304 insertions(+), 303 deletions(-) -- 2.9.3