From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MSrh1-0003qi-Ld
	for qemu-devel@nongnu.org; Mon, 20 Jul 2009 08:10:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MSrgv-0003l8-DQ
	for qemu-devel@nongnu.org; Mon, 20 Jul 2009 08:10:05 -0400
Received: from [199.232.76.173] (port=54402 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MSrgv-0003l0-4Z
	for qemu-devel@nongnu.org; Mon, 20 Jul 2009 08:10:01 -0400
Received: from mx2.redhat.com ([66.187.237.31]:39077)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kwolf@redhat.com>) id 1MSrgu-0003rz-KW
	for qemu-devel@nongnu.org; Mon, 20 Jul 2009 08:10:00 -0400
From: Kevin Wolf <kwolf@redhat.com>
Date: Mon, 20 Jul 2009 14:08:42 +0200
Message-Id: <1248091723-5934-2-git-send-email-kwolf@redhat.com>
In-Reply-To: <1248091723-5934-1-git-send-email-kwolf@redhat.com>
References: <1248091723-5934-1-git-send-email-kwolf@redhat.com>
Subject: [Qemu-devel] [PATCH 1/2] qemu-iotests: Allow spaces in io()
	operation
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: hch@lst.de
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org

We need to be able to pass "write -b" as an operation to the pattern testing
functions. Unfortunately, this contains a space character...

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 common.pattern |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common.pattern b/common.pattern
index 63df923..08e1cda 100644
--- a/common.pattern
+++ b/common.pattern
@@ -46,18 +46,18 @@ function do_io() {
 }
 
 function io_pattern() {
-    do_io $@ | $QEMU_IO $TEST_IMG | _filter_qemu_io
+    do_io "$@" | $QEMU_IO $TEST_IMG | _filter_qemu_io
 }
 
 function io() {
     local start=$2
     local pattern=$(( (start >> 9) % 256 ))
 
-    do_io $@ $pattern | $QEMU_IO $TEST_IMG | _filter_qemu_io
+    do_io "$@" $pattern | $QEMU_IO $TEST_IMG | _filter_qemu_io
 }
 
 function io_zero() {
-    do_io $@ 0 | $QEMU_IO $TEST_IMG | _filter_qemu_io
+    do_io "$@" 0 | $QEMU_IO $TEST_IMG | _filter_qemu_io
 }
 
 function io_test() {
@@ -65,28 +65,28 @@ function io_test() {
     local offset=$2
 
     # Complete clusters (size = 4k)
-    io $op $offset 4096 4096 256
+    io "$op" $offset 4096 4096 256
     offset=$((offset + 256 * 4096))
 
     # From somewhere in the middle to the end of a cluster
-    io $op $((offset + 2048)) 2048 4096 256
+    io "$op" $((offset + 2048)) 2048 4096 256
     offset=$((offset + 256 * 4096))
 
     # From the start to somewhere in the middle of a cluster
-    io $op $offset 2048 4096 256
+    io "$op" $offset 2048 4096 256
     offset=$((offset + 256 * 4096))
 
     # Completely misaligned (and small)
-    io $op $((offset + 1024)) 2048 4096 256
+    io "$op" $((offset + 1024)) 2048 4096 256
     offset=$((offset + 256 * 4096))
 
     # Spanning multiple clusters
-    io $op $((offset + 2048)) 8192 12288 64
+    io "$op" $((offset + 2048)) 8192 12288 64
     offset=$((offset + 64 * 12288))
 
     # Spanning multiple L2 tables
     # L2 table size: 512 clusters of 4k = 2M
-    io $op $((offset + 2048)) 4194304 4999680 8
+    io "$op" $((offset + 2048)) 4194304 4999680 8
     offset=$((offset + 8 * 4999680))
 
     if false; then
-- 
1.6.0.6