diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-04-03 12:45:51 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-04-04 17:10:25 +0200 |
| commit | e3fa4bfa72d5037bfc1de95cf243d8c57e38f5da (patch) | |
| tree | 73f9d0ba3037a4ae72f75fad5c2dd74f28d78a15 /tests | |
| parent | 8885eadedd0ea8b57c1baa367ee2c2d616700bd9 (diff) | |
| download | qemu-e3fa4bfa72d5037bfc1de95cf243d8c57e38f5da.zip qemu-e3fa4bfa72d5037bfc1de95cf243d8c57e38f5da.tar.gz qemu-e3fa4bfa72d5037bfc1de95cf243d8c57e38f5da.tar.bz2 | |
block: Don't parse 'filename' option
When using the QDict option 'filename', it is supposed to be interpreted
literally. The code did correctly avoid guessing the protocol from any
string before the first colon, but it still called bdrv_parse_filename()
which would, for example, incorrectly remove a 'file:' prefix in the
raw-posix driver.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/051 | 4 | ||||
| -rw-r--r-- | tests/qemu-iotests/051.out | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 14694e1..2f79b26 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -204,6 +204,10 @@ run_qemu -hda foo:bar run_qemu -drive file=foo:bar run_qemu -drive file.filename=foo:bar +run_qemu -hda "file:$TEST_IMG" +run_qemu -drive file="file:$TEST_IMG" +run_qemu -drive file.filename="file:$TEST_IMG" + echo echo === Snapshot mode === echo diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index f5e33ff..671ac5f 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -275,6 +275,17 @@ QEMU_PROG: -drive file=foo:bar: could not open disk image foo:bar: Unknown proto Testing: -drive file.filename=foo:bar QEMU_PROG: -drive file.filename=foo:bar: could not open disk image ide0-hd0: Could not open 'foo:bar': No such file or directory +Testing: -hda file:TEST_DIR/t.qcow2 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K + +Testing: -drive file=file:TEST_DIR/t.qcow2 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K + +Testing: -drive file.filename=file:TEST_DIR/t.qcow2 +QEMU_PROG: -drive file.filename=file:TEST_DIR/t.qcow2: could not open disk image ide0-hd0: Could not open 'file:TEST_DIR/t.qcow2': No such file or directory + === Snapshot mode === |