mirror of
https://git.proxmox.com/git/qemu
synced 2025-08-16 06:22:14 +00:00
qemu-iotests: add support for qed format
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
2684871af5
commit
f5a4bbd913
@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||||||
. ./common.pattern
|
. ./common.pattern
|
||||||
|
|
||||||
# Any format supporting backing files
|
# Any format supporting backing files
|
||||||
_supported_fmt qcow qcow2 vmdk
|
_supported_fmt qcow qcow2 vmdk qed
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
TEST_OFFSETS="0 4294967296"
|
TEST_OFFSETS="0 4294967296"
|
||||||
|
@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||||||
. ./common.pattern
|
. ./common.pattern
|
||||||
|
|
||||||
# Any format supporting backing files
|
# Any format supporting backing files
|
||||||
_supported_fmt qcow qcow2 vmdk
|
_supported_fmt qcow qcow2 vmdk qed
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
TEST_OFFSETS="0 4294967296"
|
TEST_OFFSETS="0 4294967296"
|
||||||
|
@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||||||
. ./common.pattern
|
. ./common.pattern
|
||||||
|
|
||||||
# Any format supporting backing files
|
# Any format supporting backing files
|
||||||
_supported_fmt qcow qcow2 vmdk
|
_supported_fmt qcow qcow2 vmdk qed
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
TEST_OFFSETS="0 4294967296"
|
TEST_OFFSETS="0 4294967296"
|
||||||
|
@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||||||
. ./common.pattern
|
. ./common.pattern
|
||||||
|
|
||||||
# Any format supporting backing files
|
# Any format supporting backing files
|
||||||
_supported_fmt qcow qcow2 vmdk
|
_supported_fmt qcow qcow2 vmdk qed
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
TEST_OFFSETS="0 4294967296"
|
TEST_OFFSETS="0 4294967296"
|
||||||
|
@ -41,8 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||||||
. ./common.filter
|
. ./common.filter
|
||||||
. ./common.pattern
|
. ./common.pattern
|
||||||
|
|
||||||
# Currently only qcow2 supports rebasing
|
# Currently only qcow2 and qed support rebasing
|
||||||
_supported_fmt qcow2
|
_supported_fmt qcow2 qed
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
CLUSTER_SIZE=65536
|
CLUSTER_SIZE=65536
|
||||||
|
@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||||||
. ./common.rc
|
. ./common.rc
|
||||||
. ./common.filter
|
. ./common.filter
|
||||||
|
|
||||||
_supported_fmt vmdk qcow qcow2
|
_supported_fmt vmdk qcow qcow2 qed
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|||||||
|
|
||||||
# Any format supporting backing files except vmdk and qcow which do not support
|
# Any format supporting backing files except vmdk and qcow which do not support
|
||||||
# smaller backing files.
|
# smaller backing files.
|
||||||
_supported_fmt qcow2
|
_supported_fmt qcow2 qed
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
# Choose a size that is not necessarily a cluster size multiple for image
|
# Choose a size that is not necessarily a cluster size multiple for image
|
||||||
|
@ -119,6 +119,7 @@ check options
|
|||||||
-cow test cow
|
-cow test cow
|
||||||
-qcow test qcow
|
-qcow test qcow
|
||||||
-qcow2 test qcow2
|
-qcow2 test qcow2
|
||||||
|
-qed test qed
|
||||||
-vdi test vdi
|
-vdi test vdi
|
||||||
-vpc test vpc
|
-vpc test vpc
|
||||||
-vmdk test vmdk
|
-vmdk test vmdk
|
||||||
@ -158,6 +159,11 @@ testlist options
|
|||||||
xpand=false
|
xpand=false
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
-qed)
|
||||||
|
IMGFMT=qed
|
||||||
|
xpand=false
|
||||||
|
;;
|
||||||
|
|
||||||
-vdi)
|
-vdi)
|
||||||
IMGFMT=vdi
|
IMGFMT=vdi
|
||||||
xpand=false
|
xpand=false
|
||||||
|
@ -55,7 +55,7 @@ _make_test_img()
|
|||||||
# at least one argument (the image size) needs to be added
|
# at least one argument (the image size) needs to be added
|
||||||
local extra_img_options=$*
|
local extra_img_options=$*
|
||||||
|
|
||||||
if [ "$IMGFMT" = "qcow2" -a -n "$CLUSTER_SIZE" ]; then
|
if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
|
||||||
extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options"
|
extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -65,6 +65,7 @@ _make_test_img()
|
|||||||
sed -e "s#$IMGFMT#IMGFMT#g" | \
|
sed -e "s#$IMGFMT#IMGFMT#g" | \
|
||||||
sed -e "s# encryption=off##g" | \
|
sed -e "s# encryption=off##g" | \
|
||||||
sed -e "s# cluster_size=0##g" | \
|
sed -e "s# cluster_size=0##g" | \
|
||||||
|
sed -e "s# table_size=0##g" | \
|
||||||
sed -e "s# compat6=off##g" | \
|
sed -e "s# compat6=off##g" | \
|
||||||
sed -e "s# static=off##g"
|
sed -e "s# static=off##g"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user