From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0tXd-0005Fi-1H for qemu-devel@nongnu.org; Mon, 23 Nov 2015 11:00:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0tXa-0006py-VW for qemu-devel@nongnu.org; Mon, 23 Nov 2015 11:00:32 -0500 From: Kevin Wolf Date: Mon, 23 Nov 2015 16:59:54 +0100 Message-Id: <1448294400-476-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1448294400-476-1-git-send-email-kwolf@redhat.com> References: <1448294400-476-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/21] qemu-iotests: Remove cache mode test without medium List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com 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 Reviewed-by: Max Reitz --- tests/qemu-iotests/051 | 12 ++++++------ tests/qemu-iotests/051.out | 14 +++++++------- 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 17dbf04..f6f0f4d 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 7765aa0..7a459a3 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) qququiquit -Testing: -drive media=cdrom,cache=directsync +Testing: -drive driver=null-co,cache=directsync QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive media=cdrom,cache=writeback +Testing: -drive driver=null-co,cache=writeback QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive media=cdrom,cache=writethrough +Testing: -drive driver=null-co,cache=writethrough QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -Testing: -drive media=cdrom,cache=unsafe +Testing: -drive driver=null-co,cache=unsafe QEMU X.Y.Z monitor - type 'help' for more information (qemu) qququiquit -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 f36add8..83da9a2 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -143,12 +143,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) -- 1.8.3.1