提交 a4b37813 编写于 作者: L lolyu

Remove configs with deprecated data plane

Related tests:
1. block_hotplug
2. block_hotplug_negative
3. block_hotplug_in_pause
4. block_resize
5. disk_extension
Signed-off-by: Nlolyu <lolyu@redhat.com>
上级 2c3c3107
...@@ -129,16 +129,3 @@ ...@@ -129,16 +129,3 @@
drive_format_stg0 = scsi-hd drive_format_stg0 = scsi-hd
drive_format_stg1 = scsi-hd drive_format_stg1 = scsi-hd
get_disk_pattern = "^/dev/sd[a-z]*$" get_disk_pattern = "^/dev/sd[a-z]*$"
variants:
- @default:
- data_plane:
no Host_RHEL.m6
only with_plug.with_system_reset.one_pci, block_scsi..with_plug.with_repetition.one_pci
iothreads = iothread0
block_virtio:
blk_extra_params_stg0 = "iothread=${iothreads}"
block_scsi:
no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
bus_extra_params_image1 = "iothread=${iothreads}"
bus_extra_params_stg0 = "iothread=${iothreads}"
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
disk_op_cmd = "WIN_UTILS:\Iozone\iozone.exe -azR -r 64k -n 125M -g 512M -M -i 0" disk_op_cmd = "WIN_UTILS:\Iozone\iozone.exe -azR -r 64k -n 125M -g 512M -M -i 0"
disk_op_cmd += " -i 1 -b %s:\iozone_test -f %s:\testfile" disk_op_cmd += " -i 1 -b %s:\iozone_test -f %s:\testfile"
get_disk_cmd = "wmic diskdrive get index,size" get_disk_cmd = "wmic diskdrive get index,size"
i440fx:
cd_format_cd1 = ide
q35:
cd_format_cd1 = ahci
variants: variants:
- one_pci: - one_pci:
...@@ -51,19 +55,3 @@ ...@@ -51,19 +55,3 @@
stop_vm_before_hotplug = yes stop_vm_before_hotplug = yes
resume_vm_after_hotplug = no resume_vm_after_hotplug = no
stop_vm_before_unplug = no stop_vm_before_unplug = no
variants:
- @default:
- data_plane:
no Host_RHEL.m6
only virtio_blk, virtio_scsi
iothreads = iothread0
virtio_blk:
blk_extra_params_image1 = "iothread=${iothreads}"
virtio_scsi:
no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
bus_extra_params = "iothread=${iothreads}"
Windows:
i440fx:
cd_format_cd1 = ide
q35:
cd_format_cd1 = ahci
...@@ -15,20 +15,8 @@ ...@@ -15,20 +15,8 @@
force_create_image_stg0 = yes force_create_image_stg0 = yes
kill_vm_on_error = yes kill_vm_on_error = yes
blk_extra_params_stg0 = "invalid_param=on" blk_extra_params_stg0 = "invalid_param=on"
Windows:
variants: i440fx:
- @default: cd_format_cd1 = ide
- data_plane: q35:
no Host_RHEL.m6 cd_format_cd1 = ahci
only virtio_blk, virtio_scsi
iothreads = iothread0
virtio_blk:
blk_extra_params_image1 = "iothread=${iothreads}"
virtio_scsi:
no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
bus_extra_params = "iothread=${iothreads}"
Windows:
i440fx:
cd_format_cd1 = ide
q35:
cd_format_cd1 = ahci
...@@ -92,14 +92,3 @@ ...@@ -92,14 +92,3 @@
tmp_md5_file = /tmp/tmp_md5_file tmp_md5_file = /tmp/tmp_md5_file
pre_command = "dd if=/dev/urandom of=${tmp_md5_file} oflag=direct bs=1M count=10" pre_command = "dd if=/dev/urandom of=${tmp_md5_file} oflag=direct bs=1M count=10"
post_command = "rm -rf ${tmp_md5_file}" post_command = "rm -rf ${tmp_md5_file}"
variants:
- @default:
- data_plane:
no Host_RHEL.m6
only virtio_blk virtio_scsi
iothreads = iothread0
virtio_blk:
blk_extra_params_stg += ",iothread=${iothreads}"
virtio_scsi:
no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
bus_extra_params_stg = "iothread=${iothreads}"
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
type = disk_extension type = disk_extension
not_preprocess = yes not_preprocess = yes
wait_timeout = 60 wait_timeout = 60
iothreads = iothread0
drive_werror = stop drive_werror = stop
drive_rerror = stop drive_rerror = stop
tmpfs_folder = "/tmp/xtmpfs" tmpfs_folder = "/tmp/xtmpfs"
...@@ -47,10 +46,8 @@ ...@@ -47,10 +46,8 @@
variants: variants:
- with_virtio_blk: - with_virtio_blk:
drive_format_stg1 = virtio drive_format_stg1 = virtio
blk_extra_params_stg1 += ",iothread=${iothreads}"
- with_virtio_scsi: - with_virtio_scsi:
drive_format_stg1 = scsi-hd drive_format_stg1 = scsi-hd
bus_extra_params += "iothread=${iothreads}"
variants: variants:
- aio_native: - aio_native:
image_aio_stg1 = native image_aio_stg1 = native
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册