From 7bd56b701dc4e3681052765ab03ce5d72840d7b4 Mon Sep 17 00:00:00 2001 From: Qingtang Zhou Date: Wed, 3 Jul 2013 13:20:05 +0800 Subject: [PATCH] qemu: Reset image_extra_params parameter in some block tests. These tests will create some other format of image, so the options for qcow3 would affect them. To make these cases still work with qcow3 format, reset the 'image_extra_params' parameter in them. Signed-off-by: Qingtang Zhou --- qemu/tests/cfg/multi_disk.cfg | 1 + tests/cfg/block_hotplug.cfg | 2 ++ tests/cfg/whql.cfg | 1 + 3 files changed, 4 insertions(+) diff --git a/qemu/tests/cfg/multi_disk.cfg b/qemu/tests/cfg/multi_disk.cfg index fc373b65..21bd1e15 100644 --- a/qemu/tests/cfg/multi_disk.cfg +++ b/qemu/tests/cfg/multi_disk.cfg @@ -23,6 +23,7 @@ cdroms = "" ide: # 3 + boot disk = 4 disks + image_extra_params = "" stg_image_num = 3 stg_params = "image_size:1G,10G,5G " stg_params += "image_format:qcow2,qcow2,raw " diff --git a/tests/cfg/block_hotplug.cfg b/tests/cfg/block_hotplug.cfg index ede1ad2d..84d5b040 100644 --- a/tests/cfg/block_hotplug.cfg +++ b/tests/cfg/block_hotplug.cfg @@ -16,10 +16,12 @@ kill_vm_on_error = yes variants: - fmt_qcow2: + image_extra_params = "" image_format_stg = qcow2 image_format_stg0 = qcow2 image_format_stg1 = qcow2 - fmt_raw: + image_extra_params = "" image_format_stg = raw image_format_stg0 = raw image_format_stg1 = raw diff --git a/tests/cfg/whql.cfg b/tests/cfg/whql.cfg index af3b7c18..87ab96f0 100644 --- a/tests/cfg/whql.cfg +++ b/tests/cfg/whql.cfg @@ -203,6 +203,7 @@ - block_device: image_snapshot = yes images += " stg stg2 stg3 stg4" + image_extra_params = "" image_format_stg = raw image_name_stg = images/storage image_size_stg = 2G -- GitLab