diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-05-07 14:41:30 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-12-18 14:34:43 +0100 |
| commit | fc17c259314d066109eb3810e2a83348d531426a (patch) | |
| tree | 253fc029b8c8eb98a3e3a1554c799f5ffd61f75e | |
| parent | 39c4ae941ed992a3bb5647fe7fafdd66d9278f43 (diff) | |
qemu-iotests: Remove cache mode test without medium
Specifying the cache mode for a driver without a medium is not a useful
thing to do: As long as there is no medium, the cache mode doesn't make
a difference, and once the 'change' command is used to insert a medium,
it ignores the old cache mode and makes the new medium use
cache=writethrough.
Later patches will make it an error to specify the cache mode for an
empty drive. Remove the corresponding test case.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/051 | 12 | ||||
| -rw-r--r-- | tests/qemu-iotests/051.out | 14 | ||||
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 17dbf04af4..f6f0f4d8d3 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -183,12 +183,12 @@ echo # Cannot use the test image because cache=none might not work on the host FS # Use cdrom so that we won't get errors about missing media -run_qemu -drive media=cdrom,cache=none -run_qemu -drive media=cdrom,cache=directsync -run_qemu -drive media=cdrom,cache=writeback -run_qemu -drive media=cdrom,cache=writethrough -run_qemu -drive media=cdrom,cache=unsafe -run_qemu -drive media=cdrom,cache=invalid_value +run_qemu -drive driver=null-co,cache=none +run_qemu -drive driver=null-co,cache=directsync +run_qemu -drive driver=null-co,cache=writeback +run_qemu -drive driver=null-co,cache=writethrough +run_qemu -drive driver=null-co,cache=unsafe +run_qemu -drive driver=null-co,cache=invalid_value echo echo === Specifying the protocol layer === diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index 7765aa0bb2..7a459a3989 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -215,28 +215,28 @@ QEMU X.Y.Z monitor - type 'help' for more information === Cache modes === -Testing: -drive media=cdrom,cache=none +Testing: -drive driver=null-co,cache=none QEMU X.Y.Z monitor - type 'help' for more information (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K -Testing: -drive media=cdrom,cache=directsync +Testing: -drive driver=null-co,cache=directsync QEMU X.Y.Z monitor - type 'help' for more information (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K -Testing: -drive media=cdrom,cache=writeback +Testing: -drive driver=null-co,cache=writeback QEMU X.Y.Z monitor - type 'help' for more information (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K -Testing: -drive media=cdrom,cache=writethrough +Testing: -drive driver=null-co,cache=writethrough QEMU X.Y.Z monitor - type 'help' for more information (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K -Testing: -drive media=cdrom,cache=unsafe +Testing: -drive driver=null-co,cache=unsafe QEMU X.Y.Z monitor - type 'help' for more information (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K -Testing: -drive media=cdrom,cache=invalid_value -QEMU_PROG: -drive media=cdrom,cache=invalid_value: invalid cache option +Testing: -drive driver=null-co,cache=invalid_value +QEMU_PROG: -drive driver=null-co,cache=invalid_value: invalid cache option === Specifying the protocol layer === diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 27eddec3e8..0a238ec1b7 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -148,12 +148,12 @@ class VM(object): def add_drive(self, path, opts='', interface='virtio'): '''Add a virtio-blk drive to the VM''' options = ['if=%s' % interface, - 'cache=%s' % cachemode, 'id=drive%d' % self._num_drives] if path is not None: options.append('file=%s' % path) options.append('format=%s' % imgfmt) + options.append('cache=%s' % cachemode) if opts: options.append(opts) |