Currently, the configuration of blkdebug and blkverify is done through the "filename" alone. There is now way of manually choosing blkdebug or blkverify as a driver and using a normal image filename.
In the case of blkdebug, the filename starts with the protocol prefix, follows up with the name of a configuration file and ends with the name of the image file. In the case of blkverify, the filename starts with the protocol prefix, follows up with the raw reference image filename and ends with the name of the image file. This patch allows the configuration of both drivers completely through QMP and accordingly command-line options. The driver has to be selected through the driver option (or similar), the image filename may be given either as the filename itself or through a x.filename option, where "x" depends on the driver. Further options may be required depending on the driver. In case of blkverify, the test image may be specified either through the filename or as a BlockdevRef reference through the "test" option. The raw image is referenced as "raw". In case of blkdebug, one may either set the "config" option to the filename of a configuration file, or the content of the configuration file may be given directly (as options). The image filename is either specified as the filename or referenced through the "image" option. v3: - The first few patches are probably similar to the ones from the previous series; but it's probably best to see this series as a completely new one. Max Reitz (21): blkdebug: Use errp for read_config() blkdebug: Don't require sophisticated filename qdict: Add qdict_array_split() qapi: extend qdict_flatten() for QLists qemu-option: Add qemu_config_parse_qdict() blkdebug: Always call read_config() blkdebug: Use command-line in read_config() block: Allow reference for bdrv_file_open() block: Pass reference to bdrv_file_open() block: Allow block devices without files block: Allow recursive "file"s qemu-iotests: Fix output of test 051 blockdev: Move "file" to legacy_opts blkdebug: Allow command-line file configuration blkdebug: Make filename optional blkverify: Allow command-line configuration blkverify: Don't require protocol filename blkdebug: Alias "errno" as "error" qapi: QMP interface for blkdebug and blkverify qemu-io: Make filename optional iotests: Test new blkdebug/blkverify interface block.c | 58 ++++++++++--- block/blkdebug.c | 90 ++++++++++++++------ block/blkverify.c | 65 ++++++++++----- block/cow.c | 3 +- block/qcow.c | 3 +- block/qcow2.c | 2 +- block/qed.c | 4 +- block/sheepdog.c | 4 +- block/vhdx.c | 2 +- block/vmdk.c | 4 +- blockdev.c | 19 +++-- include/block/block.h | 3 +- include/qapi/qmp/qdict.h | 1 + include/qemu/config-file.h | 6 ++ qapi-schema.json | 94 ++++++++++++++++++++- qemu-io.c | 10 ++- qobject/qdict.c | 81 +++++++++++++++++- tests/qemu-iotests/051.out | 2 +- tests/qemu-iotests/071 | 201 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/071.out | 73 ++++++++++++++++ tests/qemu-iotests/group | 1 + util/qemu-config.c | 95 +++++++++++++++++++++ 22 files changed, 729 insertions(+), 92 deletions(-) create mode 100755 tests/qemu-iotests/071 create mode 100644 tests/qemu-iotests/071.out -- 1.8.5.1
