92 lines
3.1 KiB
Diff
92 lines
3.1 KiB
Diff
From 3c96dbd74fb67e2ae1a116b2771290b192041707 Mon Sep 17 00:00:00 2001
|
|
From: Eric Blake <eblake@redhat.com>
|
|
Date: Tue, 2 Jun 2020 02:34:10 +0100
|
|
Subject: [PATCH 05/26] iotests: Let _make_test_img parse its parameters
|
|
|
|
RH-Author: Eric Blake <eblake@redhat.com>
|
|
Message-id: <20200602023420.2133649-3-eblake@redhat.com>
|
|
Patchwork-id: 97070
|
|
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 02/12] iotests: Let _make_test_img parse its parameters
|
|
Bugzilla: 1779893 1779904
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
|
From: Max Reitz <mreitz@redhat.com>
|
|
|
|
This will allow us to add more options than just -b.
|
|
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
Message-id: 20191107163708.833192-9-mreitz@redhat.com
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
(cherry picked from commit eea871d047701b563cfd66c1566b9ff6d163882b)
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
|
|
1 file changed, 20 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
|
index 0cc8acc..99fef4d 100644
|
|
--- a/tests/qemu-iotests/common.rc
|
|
+++ b/tests/qemu-iotests/common.rc
|
|
@@ -302,12 +302,12 @@ _make_test_img()
|
|
# extra qemu-img options can be added by tests
|
|
# at least one argument (the image size) needs to be added
|
|
local extra_img_options=""
|
|
- local image_size=$*
|
|
local optstr=""
|
|
local img_name=""
|
|
local use_backing=0
|
|
local backing_file=""
|
|
local object_options=""
|
|
+ local misc_params=()
|
|
|
|
if [ -n "$TEST_IMG_FILE" ]; then
|
|
img_name=$TEST_IMG_FILE
|
|
@@ -323,11 +323,23 @@ _make_test_img()
|
|
optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
|
|
fi
|
|
|
|
- if [ "$1" = "-b" ]; then
|
|
- use_backing=1
|
|
- backing_file=$2
|
|
- image_size=$3
|
|
- fi
|
|
+ for param; do
|
|
+ if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
|
|
+ backing_file=$param
|
|
+ continue
|
|
+ fi
|
|
+
|
|
+ case "$param" in
|
|
+ -b)
|
|
+ use_backing=1
|
|
+ ;;
|
|
+
|
|
+ *)
|
|
+ misc_params=("${misc_params[@]}" "$param")
|
|
+ ;;
|
|
+ esac
|
|
+ done
|
|
+
|
|
if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
|
|
optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
|
|
fi
|
|
@@ -343,9 +355,9 @@ _make_test_img()
|
|
# XXX(hch): have global image options?
|
|
(
|
|
if [ $use_backing = 1 ]; then
|
|
- $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1
|
|
+ $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1
|
|
else
|
|
- $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1
|
|
+ $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1
|
|
fi
|
|
) | _filter_img_create
|
|
|
|
--
|
|
1.8.3.1
|
|
|