diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-08-15 17:36:33 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2019-09-03 14:55:35 +0200 |
| commit | cdc0dd2586d726f7b549be08a8e073f803cd5dc9 (patch) | |
| tree | 2fe6d3ef914b40bb779d20742b99565eb386cdc6 /tests | |
| parent | f158ffdba62360b221047dee488450f8c49f6a22 (diff) | |
| download | qemu-cdc0dd2586d726f7b549be08a8e073f803cd5dc9.zip qemu-cdc0dd2586d726f7b549be08a8e073f803cd5dc9.tar.gz qemu-cdc0dd2586d726f7b549be08a8e073f803cd5dc9.tar.bz2 | |
vmdk: Use bdrv_dirname() for relative extent paths
This makes iotest 033 pass with e.g. subformat=monolithicFlat. It also
turns a former error in 059 into success.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190815153638.4600-3-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/059 | 7 | ||||
| -rw-r--r-- | tests/qemu-iotests/059.out | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 279aee6..fbed5f9 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -114,9 +114,12 @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2 echo echo "=== Testing monolithicFlat with internally generated JSON file name ===" +# Should work, because bdrv_dirname() works fine with blkdebug IMGOPTS="subformat=monolithicFlat" _make_test_img 64M -$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" 2>&1 \ - | _filter_testdir | _filter_imgfmt +$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \ + -c info \ + 2>&1 \ + | _filter_testdir | _filter_imgfmt | _filter_img_info _cleanup_test_img echo diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index b2e718d..a51b571 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2050,7 +2050,9 @@ wrote 512/512 bytes at offset 10240 === Testing monolithicFlat with internally generated JSON file name === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 -qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}' +format name: IMGFMT +cluster size: 0 bytes +vm state offset: 0 bytes === Testing version 3 === image: TEST_DIR/iotest-version3.IMGFMT |