On 11/12/2014 09:11 AM, Kevin Wolf wrote: > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > block/qapi.c | 7 +++++++ > hmp.c | 8 ++++++++ > qapi/block-core.json | 20 +++++++++++++++++++- > tests/qemu-iotests/051.out | 1 + > tests/qemu-iotests/067.out | 10 +++++----- > 5 files changed, 40 insertions(+), 6 deletions(-)
Reviewed-by: Eric Blake <ebl...@redhat.com>
> +++ b/tests/qemu-iotests/067.out
> @@ -6,7 +6,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device
> virtio-blk-pci,drive=disk,id=virtio0
> QMP_VERSION
> {"return": {}}
> -{"return": [{"io-status": "ok", "device": "disk", "locked": false,
> "removable": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off",
> "image": {"virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2",
> "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE,
> "format-specific": {"type": "qcow2", "data": {"compat": "1.1",
> "lazy-refcounts": false, "corrupt": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "type": "unknown"}, {"io-status": "ok",
> "device": "ide1-cd0", "locked": false, "removable": true, "tray_open": false,
> "type": "unknown"}, {"device": "floppy0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "sd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}]}
> +{"return": [{"io-status": "ok", "device": "disk", "locked": false,
> "removable": false, "inserted": {"iops_rd": 0, "detect_zeroes": "off",
> "image": {"virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2",
> "cluster-size": 65536, "format": "qcow2", "actual-size": SIZE,
> "format-specific": {"type": "qcow2", "data": {"compat": "1.1",
> "lazy-refcounts": false, "corrupt": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "cache": {"no-flush": false,
> "direct": false, "writeback": true}, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "type": "unknown"}, {"io-status": "ok",
> "device": "ide1-cd0", "locked": false, "removable": true, "tray_open": false,
> "type": "unknown"}, {"device": "floppy0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "sd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknow!
Will conflict with the patch to add -qmp-pretty to avoid the long lines;
but the resolution is straightforward for whoever loses the race.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
