diff --git a/generic/tests/cfg/kdump.cfg b/generic/tests/cfg/kdump.cfg index 09d160f762..5e93cb5202 100644 --- a/generic/tests/cfg/kdump.cfg +++ b/generic/tests/cfg/kdump.cfg @@ -60,7 +60,7 @@ RHEL.9: kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args='nmi_watchdog=1'" crash_cmd = nmi - send_nmi_cmd = "echo 1 > /proc/sys/kernel/unknown_nmi_panic" + send_nmi_cmd = "echo 1 > /proc/sys/kernel/unknown_nmi_panic" ppc64, ppc64le: send_nmi_cmd = "echo 1 > /proc/sys/kernel/nmi_watchdog" kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args='crashkernel=512M@64M nmi_watchdog=1'" @@ -118,5 +118,5 @@ variants: - one_vm: - multi_vms: - vms += " vm2" - image_snapshot = yes + vms += " vm2" + image_snapshot = yes diff --git a/multi_host_migration/tests/cfg/multi_host.cfg b/multi_host_migration/tests/cfg/multi_host.cfg index 892ef9d3a3..7a32c04914 100644 --- a/multi_host_migration/tests/cfg/multi_host.cfg +++ b/multi_host_migration/tests/cfg/multi_host.cfg @@ -196,19 +196,19 @@ no RHEL.3, RHEL.4 crash_timeout = 360 RHEL.5: - kdump_config = core_collector makedumpfile -c -d 31 + kdump_config = core_collector makedumpfile -c -d 31 RHEL.6: - kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=128M@16M" - kdump_enable_cmd = "chkconfig kdump on && service kdump restart" - kdump_propagate_cmd = "service kdump propagate" - kdump_restart_cmd = "service kdump restart" - kdump_status_cmd = "service kdump status" + kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=128M@16M" + kdump_enable_cmd = "chkconfig kdump on && service kdump restart" + kdump_propagate_cmd = "service kdump propagate" + kdump_restart_cmd = "service kdump restart" + kdump_status_cmd = "service kdump status" RHEL.7: - kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=auto" - kdump_enable_cmd = "chkconfig kdump on && systemctl restart kdump.service" - kdump_propagate_cmd = "kdumpctl propagate" - kdump_restart_cmd = "systemctl restart kdump.service" - kdump_status_cmd = "systemctl status kdump.service" + kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=auto" + kdump_enable_cmd = "chkconfig kdump on && systemctl restart kdump.service" + kdump_propagate_cmd = "kdumpctl propagate" + kdump_restart_cmd = "systemctl restart kdump.service" + kdump_status_cmd = "systemctl status kdump.service" - with_xbzrle: type = migration_multi_host_with_xbzrle capabilitys = "xbzrle" @@ -217,27 +217,27 @@ max_migration_speed = 1000M not_wait_for_migration = yes Windows: - timeout = 600 - autostress = yes - unload_stress_in_the_end = no - sleep_before_migration = 10 - bg_stress_test = win_heavyload - backup_image_before_testing = yes - restore_image_after_testing = yes - config_cmd = 'setx -m path "%PATH%;${install_path};"' - install_cmd = "start /wait DRIVE:\HeavyLoadSetup.exe /verysilent" - check_running_cmd = "tasklist | findstr /I HeavyLoad.exe" - kill_bg_stress_cmd = "taskkill /T /F /IM HeavyLoad.exe" - x86_64: - install_path = "C:\Program Files (x86)\JAM Software\HeavyLoad" - i386, i686: - install_path = "C:\Program Files\JAM Software\HeavyLoad" + timeout = 600 + autostress = yes + unload_stress_in_the_end = no + sleep_before_migration = 10 + bg_stress_test = win_heavyload + backup_image_before_testing = yes + restore_image_after_testing = yes + config_cmd = 'setx -m path "%PATH%;${install_path};"' + install_cmd = "start /wait DRIVE:\HeavyLoadSetup.exe /verysilent" + check_running_cmd = "tasklist | findstr /I HeavyLoad.exe" + kill_bg_stress_cmd = "taskkill /T /F /IM HeavyLoad.exe" + x86_64: + install_path = "C:\Program Files (x86)\JAM Software\HeavyLoad" + i386, i686: + install_path = "C:\Program Files\JAM Software\HeavyLoad" Linux: - bg_stress_test = autotest_control - test_control_file = stress.control - control_args = "--cpu 4 --io 4 --vm 2 --vm-bytes 128M --timeout 120s" - check_running_cmd = 'pgrep stress' - kill_bg_stress_cmd = "killall -9 stress" + bg_stress_test = autotest_control + test_control_file = stress.control + control_args = "--cpu 4 --io 4 --vm 2 --vm-bytes 128M --timeout 120s" + check_running_cmd = 'pgrep stress' + kill_bg_stress_cmd = "killall -9 stress" variants: - before_migrate_capability: sub_type = before_migrate_capability @@ -250,9 +250,9 @@ sub_test = "set_xbzrle enable" need_stress = "yes" Linux: - need_set_speed = yes + need_set_speed = yes Windows: - need_set_speed = no + need_set_speed = no set_cache_size = "no yes" - after_migrate_cache_size: sub_type = after_migrate_cache_size @@ -588,4 +588,3 @@ - rhel6.2.0: - rhel6.3.0: - rhel6.4.0: - diff --git a/qemu/tests/cfg/bitmap_boundary_test.cfg b/qemu/tests/cfg/bitmap_boundary_test.cfg index 00ecf4ac98..183a7e8d21 100644 --- a/qemu/tests/cfg/bitmap_boundary_test.cfg +++ b/qemu/tests/cfg/bitmap_boundary_test.cfg @@ -20,15 +20,15 @@ bitmap_count = 65535 variants: - with_data_plane: - only Host_RHEL - no Host_RHEL.m5, Host_RHEL.m6 - only virtio_blk, virtio_scsi - iothreads = "iothread0 iothread1" - virtio_blk: - blk_extra_params_image1 = "iothread=iothread0" - blk_extra_params_src1 = "iothread=iothread1" - virtio_scsi: - no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2 - bus_extra_params_image1 = "iothread=iothread0" - bus_extra_params_src1 = "iothread=iothread1" + only Host_RHEL + no Host_RHEL.m5, Host_RHEL.m6 + only virtio_blk, virtio_scsi + iothreads = "iothread0 iothread1" + virtio_blk: + blk_extra_params_image1 = "iothread=iothread0" + blk_extra_params_src1 = "iothread=iothread1" + virtio_scsi: + no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2 + bus_extra_params_image1 = "iothread=iothread0" + bus_extra_params_src1 = "iothread=iothread1" - @defaults: diff --git a/qemu/tests/cfg/block_discard_hotplug.cfg b/qemu/tests/cfg/block_discard_hotplug.cfg index 1cfd82fe36..edf5097ac5 100644 --- a/qemu/tests/cfg/block_discard_hotplug.cfg +++ b/qemu/tests/cfg/block_discard_hotplug.cfg @@ -16,22 +16,22 @@ guest_rm_command = "rm -rf ${guest_test_file};sync" guest_fstrim_command = "fstrim ${guest_mount_point}" variants: - - local_file: - no luks - no RHEL.7 - force_create_image_stg1 = yes - image_size_stg1 = 1G - image_name_stg1 = images/stg1 - # It need set discard=on the virtio-blk device under pc mode - virtio_blk..i440fx: - blk_extra_params_stg1 += ",discard=on" - - scsi_debug: - only virtio_scsi - scsi_debug = yes - force_create_image_stg1 = no - pre_command = "modprobe -r scsi_debug; modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0" - post_command = "modprobe -r scsi_debug" - drive_format_stg1 = scsi-block - image_format_stg1 = raw - image_raw_device_stg1 = yes - remove_image_stg1 = no + - local_file: + no luks + no RHEL.7 + force_create_image_stg1 = yes + image_size_stg1 = 1G + image_name_stg1 = images/stg1 + # It need set discard=on the virtio-blk device under pc mode + virtio_blk..i440fx: + blk_extra_params_stg1 += ",discard=on" + - scsi_debug: + only virtio_scsi + scsi_debug = yes + force_create_image_stg1 = no + pre_command = "modprobe -r scsi_debug; modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0" + post_command = "modprobe -r scsi_debug" + drive_format_stg1 = scsi-block + image_format_stg1 = raw + image_raw_device_stg1 = yes + remove_image_stg1 = no diff --git a/qemu/tests/cfg/block_discard_write_same.cfg b/qemu/tests/cfg/block_discard_write_same.cfg index e48426677e..8d89a6c783 100644 --- a/qemu/tests/cfg/block_discard_write_same.cfg +++ b/qemu/tests/cfg/block_discard_write_same.cfg @@ -14,28 +14,28 @@ drive_format_stg1 = scsi-hd variants: - local_file: - scsi_debug = no - tmpdir = /home/tmp - loopdev = ${tmpdir}/loopdev - backend_base = ${tmpdir}/base.img - backend_folder = ${tmpdir}/xfs - backend_file = ${backend_folder}/test.img - image_name_stg1 = ${backend_file} - pre_command += "mkdir -p ${tmpdir} && " - pre_command += "qemu-img create -f raw ${backend_base} 2G &&" - pre_command += "losetup -f --show ${backend_base} > ${loopdev} &&" - pre_command += "mkfs.xfs `cat ${loopdev}` && mkdir -p ${backend_folder} &&" - pre_command += "mount `cat ${loopdev}` ${backend_folder} && losetup -l &&" - pre_command += "qemu-img create -f raw ${backend_file} 1G" - post_command += "umount ${backend_folder};sleep 2;losetup -d `cat ${loopdev}` &&" - post_command += "rm -rf ${tmpdir} && losetup -l " + scsi_debug = no + tmpdir = /home/tmp + loopdev = ${tmpdir}/loopdev + backend_base = ${tmpdir}/base.img + backend_folder = ${tmpdir}/xfs + backend_file = ${backend_folder}/test.img + image_name_stg1 = ${backend_file} + pre_command += "mkdir -p ${tmpdir} && " + pre_command += "qemu-img create -f raw ${backend_base} 2G &&" + pre_command += "losetup -f --show ${backend_base} > ${loopdev} &&" + pre_command += "mkfs.xfs `cat ${loopdev}` && mkdir -p ${backend_folder} &&" + pre_command += "mount `cat ${loopdev}` ${backend_folder} && losetup -l &&" + pre_command += "qemu-img create -f raw ${backend_file} 1G" + post_command += "umount ${backend_folder};sleep 2;losetup -d `cat ${loopdev}` &&" + post_command += "rm -rf ${tmpdir} && losetup -l " - scsi_debug: - start_vm = no - scsi_debug = yes - pre_command += "modprobe -r scsi_debug;" - variants: - - unmap: - pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0" - - writesame: - pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=0 lbpws=1 lbprz=0" - post_command += "modprobe -r scsi_debug;" + start_vm = no + scsi_debug = yes + pre_command += "modprobe -r scsi_debug;" + variants: + - unmap: + pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=1 lbpws=1 lbprz=0" + - writesame: + pre_command += "modprobe scsi_debug dev_size_mb=1024 lbpu=0 lbpws=1 lbprz=0" + post_command += "modprobe -r scsi_debug;" diff --git a/qemu/tests/cfg/block_iscsi_fault_disk.cfg b/qemu/tests/cfg/block_iscsi_fault_disk.cfg index d2ce8d80b5..06b2c7b980 100644 --- a/qemu/tests/cfg/block_iscsi_fault_disk.cfg +++ b/qemu/tests/cfg/block_iscsi_fault_disk.cfg @@ -26,9 +26,9 @@ cmd_dmsetup += "160005 80000 linear {1} 160005 '" cmd_dmsetup += "| dmsetup create {0} " Linux: - guest_cmd = "dd of=%s if=/dev/zero oflag=direct bs=1M count=100" + guest_cmd = "dd of=%s if=/dev/zero oflag=direct bs=1M count=100" Windows: - guest_cmd = "WIN_UTILS:\dd.exe of=\\.\physicaldrive%s if=/dev/zero bs=1M count=100" + guest_cmd = "WIN_UTILS:\dd.exe of=\\.\physicaldrive%s if=/dev/zero bs=1M count=100" kill_max_timeout = 240 kill_min_timeout = 60 diff --git a/qemu/tests/cfg/block_iscsi_format_large_size_disk.cfg b/qemu/tests/cfg/block_iscsi_format_large_size_disk.cfg index c0eeca5376..fa653ced0d 100644 --- a/qemu/tests/cfg/block_iscsi_format_large_size_disk.cfg +++ b/qemu/tests/cfg/block_iscsi_format_large_size_disk.cfg @@ -25,15 +25,15 @@ fstype = ntfs variants: - with_virtio: - serial = large_disk - drive_format_stg1 = virtio - blk_extra_params_stg1 = "serial=${serial},indirect_desc=off" + serial = large_disk + drive_format_stg1 = virtio + blk_extra_params_stg1 = "serial=${serial},indirect_desc=off" - with_scsi_hd: - serial = large_disk - blk_extra_params_stg1 = "serial=${serial}" - drive_format_stg1 = scsi-hd + serial = large_disk + blk_extra_params_stg1 = "serial=${serial}" + drive_format_stg1 = scsi-hd - with_scsi_block: - set_max_sector = yes - set_max_segment = yes - drive_bus_stg1 = 1 - drive_format_stg1 = scsi-block + set_max_sector = yes + set_max_segment = yes + drive_bus_stg1 = 1 + drive_format_stg1 = scsi-block diff --git a/qemu/tests/cfg/block_stream.cfg b/qemu/tests/cfg/block_stream.cfg index 423b226ef6..f40c420851 100644 --- a/qemu/tests/cfg/block_stream.cfg +++ b/qemu/tests/cfg/block_stream.cfg @@ -52,35 +52,35 @@ type = block_stream_simple variants: - start_stream: - type = block_stream + type = block_stream - set_speed: - default_speed_image1 = 10M - after_finished = "reboot verify_alive" + default_speed_image1 = 10M + after_finished = "reboot verify_alive" - reset_speed: - default_speed_image1 = 1M - when_streaming = "set_speed" - max_speed_image1 = 10M - after_finished = "reboot verify_alive" - variants: - - max_speed: - expected_speed_image1 = 10485760 - - min_speed: - wait_timeout = 30000 - expected_speed_image1 = 10 + default_speed_image1 = 1M + when_streaming = "set_speed" + max_speed_image1 = 10M + after_finished = "reboot verify_alive" + variants: + - max_speed: + expected_speed_image1 = 10485760 + - min_speed: + wait_timeout = 30000 + expected_speed_image1 = 10 - cancel_sync: - wait_finished = no - cancel_timeout_image1 = 3 - when_streaming = "cancel" + wait_finished = no + cancel_timeout_image1 = 3 + when_streaming = "cancel" - cancel_async: - wait_finished = no - cancel_timeout_image1 = 3 - max_speed_image1 = 10M - when_streaming = "set_speed cancel" + wait_finished = no + cancel_timeout_image1 = 3 + max_speed_image1 = 10M + when_streaming = "set_speed cancel" - query: - cancel_timeout_image1 = 3 - wait_finished = no - default_speed_image1 = 8M - when_streaming = "get_status cancel" + cancel_timeout_image1 = 3 + wait_finished = no + default_speed_image1 = 8M + when_streaming = "get_status cancel" - when_reboot: type = block_stream_reboot reboot_method = "system_reset" @@ -127,9 +127,9 @@ before_start = "create_files stop" after_finished = "resume verify_md5s" - with_stop_cont: - type = block_stream_simple - when_streaming = "stop resume stop resume stop resume" - after_finished = "reboot verify_alive" + type = block_stream_simple + when_streaming = "stop resume stop resume stop resume" + after_finished = "reboot verify_alive" - with_installation: type = block_stream_installation wait_timeout = 36000 diff --git a/qemu/tests/cfg/block_stream_negative.cfg b/qemu/tests/cfg/block_stream_negative.cfg index d4450ce13c..fb877a554c 100644 --- a/qemu/tests/cfg/block_stream_negative.cfg +++ b/qemu/tests/cfg/block_stream_negative.cfg @@ -34,15 +34,15 @@ type = block_stream_negative variants: - reset_speed: - no Host_RHEL.m6 - default_speed_image1 = 10M - when_streaming = "set_speed" - after_finished = "reboot verify_alive" - variants: - - minus_speed: - need_convert_to_int = yes - match_str = "Invalid parameter" - expected_speed_image1 = -12345 - - string_speed: - match_str = "Invalid parameter type" - expected_speed_image1 = abcdef + no Host_RHEL.m6 + default_speed_image1 = 10M + when_streaming = "set_speed" + after_finished = "reboot verify_alive" + variants: + - minus_speed: + need_convert_to_int = yes + match_str = "Invalid parameter" + expected_speed_image1 = -12345 + - string_speed: + match_str = "Invalid parameter type" + expected_speed_image1 = abcdef diff --git a/qemu/tests/cfg/blockdev_commit_throttle.cfg b/qemu/tests/cfg/blockdev_commit_throttle.cfg index 88ade7126c..70cec3f466 100644 --- a/qemu/tests/cfg/blockdev_commit_throttle.cfg +++ b/qemu/tests/cfg/blockdev_commit_throttle.cfg @@ -33,7 +33,7 @@ rebase_mode = unsafe qemu_force_use_drive_expression = no - # For throttling test + # For throttling test throttle_groups= group1 image_throttle_group_data = group1 iscsi_direct: diff --git a/qemu/tests/cfg/blockdev_inc_backup.cfg b/qemu/tests/cfg/blockdev_inc_backup.cfg index 3cbf08cbb1..ff478bb629 100644 --- a/qemu/tests/cfg/blockdev_inc_backup.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup.cfg @@ -34,18 +34,18 @@ - @one_data_disk: variants: - granularity_512: - granularity = 512 + granularity = 512 - granularity_8K: - granularity = 8192 + granularity = 8192 - granularity_16M: - granularity = 16777216 + granularity = 16777216 - granularity_64M: - granularity = 67108864 + granularity = 67108864 - granularity_2G: - granularity = 2147483648 + granularity = 2147483648 - granularity_random: - granularity = random - granularity_blacklist = "512 8192 16777216 67108864 2147483648" + granularity = random + granularity_blacklist = "512 8192 16777216 67108864 2147483648" - @granularity_default: - multi_data_disks: images += " data2" @@ -117,4 +117,4 @@ force_create_image_data2 = no remove_image_data2 = no negative_test: - image_size_inc2 = 1G + image_size_inc2 = 1G diff --git a/qemu/tests/cfg/blockdev_inc_backup_bitmap_inuse.cfg b/qemu/tests/cfg/blockdev_inc_backup_bitmap_inuse.cfg index c23b94524a..ee0dcd6b54 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_bitmap_inuse.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_bitmap_inuse.cfg @@ -1,7 +1,6 @@ # The following testing scenario is covered: # Bitmap in-use cannot be cleared/removed/used - - blockdev_inc_backup_bitmap_inuse: only Linux virt_test_type = qemu diff --git a/qemu/tests/cfg/blockdev_inc_backup_bitmap_max_len_name.cfg b/qemu/tests/cfg/blockdev_inc_backup_bitmap_max_len_name.cfg index d475f64dfd..bc4b658970 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_bitmap_max_len_name.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_bitmap_max_len_name.cfg @@ -1,7 +1,6 @@ # The following testing scenario is covered: # Add a persistent bitmap with 1023-char(max) as its name - - blockdev_inc_backup_bitmap_max_len_name: only Linux #FIXME:add ceph back if qcow2 works normally on it diff --git a/qemu/tests/cfg/blockdev_inc_backup_bitmap_not_exist.cfg b/qemu/tests/cfg/blockdev_inc_backup_bitmap_not_exist.cfg index 16be06cec9..241f222b6a 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_bitmap_not_exist.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_bitmap_not_exist.cfg @@ -3,7 +3,6 @@ # Note: # The backup image is a local fs image - - blockdev_inc_backup_bitmap_not_exist: only Linux #FIXME:will add ceph back if qcow2 supported on it diff --git a/qemu/tests/cfg/blockdev_inc_backup_bitmap_size.cfg b/qemu/tests/cfg/blockdev_inc_backup_bitmap_size.cfg index 279eeb5f40..0a54634ff2 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_bitmap_size.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_bitmap_size.cfg @@ -1,7 +1,6 @@ # The following testing scenario is covered: # Estimate space utilization of bitmaps - - blockdev_inc_backup_bitmap_size: only Linux #FIXME:add ceph back after qcow2 works normally on it diff --git a/qemu/tests/cfg/blockdev_inc_backup_expose_active_bitmap.cfg b/qemu/tests/cfg/blockdev_inc_backup_expose_active_bitmap.cfg index 63cc48e025..003d67331b 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_expose_active_bitmap.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_expose_active_bitmap.cfg @@ -2,7 +2,6 @@ # Expose an active bitmap # The fleecing image must be a local fs image - - blockdev_inc_backup_expose_active_bitmap: only Linux virt_test_type = qemu diff --git a/qemu/tests/cfg/blockdev_inc_backup_inconsistent_bitmap.cfg b/qemu/tests/cfg/blockdev_inc_backup_inconsistent_bitmap.cfg index 8439838d0a..ae3f490eb7 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_inconsistent_bitmap.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_inconsistent_bitmap.cfg @@ -2,7 +2,6 @@ # enable/disable/clear/remove an inconsistent bitmap with qmp command # remove an inconsistent bitmap with qemu-img --repair - - blockdev_inc_backup_inconsistent_bitmap: only Linux #FIXME:add ceph back after qcow2 works normally on it diff --git a/qemu/tests/cfg/blockdev_inc_backup_migrate_without_bitmap.cfg b/qemu/tests/cfg/blockdev_inc_backup_migrate_without_bitmap.cfg index f4816ff09e..a4ebe73601 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_migrate_without_bitmap.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_migrate_without_bitmap.cfg @@ -2,7 +2,6 @@ # Migrate without persistent/non-persistent bitmap # The backup images are local images(filesystem) - - blockdev_inc_backup_migrate_without_bitmap: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_no_space.cfg b/qemu/tests/cfg/blockdev_inc_backup_no_space.cfg index 7700f7df0a..e2bc21df0f 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_no_space.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_no_space.cfg @@ -2,7 +2,6 @@ # Do full backup to an image without enough space # The backup images are local images(filesystem) - - blockdev_inc_backup_no_space: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_nospace_with_bitmap_mode.cfg b/qemu/tests/cfg/blockdev_inc_backup_nospace_with_bitmap_mode.cfg index 290427c857..1e4fe38322 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_nospace_with_bitmap_mode.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_nospace_with_bitmap_mode.cfg @@ -3,7 +3,6 @@ # The backup images are local images(filesystem) # No enough space for incremental backup image - - blockdev_inc_backup_nospace_with_bitmap_mode: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_pull_mode_diff.cfg b/qemu/tests/cfg/blockdev_inc_backup_pull_mode_diff.cfg index 8ac1780cef..a6ab53f287 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_pull_mode_diff.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_pull_mode_diff.cfg @@ -4,7 +4,6 @@ # Do differential live backup via pull mode # The fleecing images must be local fs images - - blockdev_inc_backup_pull_mode_diff: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_down.cfg b/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_down.cfg index 7a3b6a08f1..c373f21550 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_down.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_down.cfg @@ -4,7 +4,6 @@ # Poweroff vm when pulling image from internal nbd server # The fleecing image must be a local fs image - - blockdev_inc_backup_pull_mode_vm_down: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_reboot.cfg b/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_reboot.cfg index c35d420a7e..ed8df6a500 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_reboot.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_pull_mode_vm_reboot.cfg @@ -4,7 +4,6 @@ # Reboot vm when pulling image from internal nbd server # The fleecing image must be a local fs image - - blockdev_inc_backup_pull_mode_vm_reboot: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_inc_backup_resize.cfg b/qemu/tests/cfg/blockdev_inc_backup_resize.cfg index fcd2982a01..4f703bf4a6 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_resize.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_resize.cfg @@ -1,7 +1,6 @@ # The following testing scenario is covered: # resize a qcow2 image with persistent bitmap stored on it - - blockdev_inc_backup_resize: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_target_not_exist.cfg b/qemu/tests/cfg/blockdev_inc_backup_target_not_exist.cfg index 952024dc1d..3327115310 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_target_not_exist.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_target_not_exist.cfg @@ -3,7 +3,6 @@ # Note: # The backup image is a local fs image - - blockdev_inc_backup_target_not_exist: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_with_complete_mode.cfg b/qemu/tests/cfg/blockdev_inc_backup_with_complete_mode.cfg index 3793bff2ec..f974a2d4b1 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_with_complete_mode.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_with_complete_mode.cfg @@ -3,7 +3,6 @@ # The backup images are local images(filesystem) # No enough space for incremental backup image - - blockdev_inc_backup_with_complete_mode: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_with_throttling.cfg b/qemu/tests/cfg/blockdev_inc_backup_with_throttling.cfg index 98fc065456..88708658a6 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_with_throttling.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_with_throttling.cfg @@ -2,7 +2,6 @@ # Do incremental backup with throttling # The backup images are local images(filesystem) - - blockdev_inc_backup_with_throttling: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_without_bitmap.cfg b/qemu/tests/cfg/blockdev_inc_backup_without_bitmap.cfg index 185f831963..cd30ef6354 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_without_bitmap.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_without_bitmap.cfg @@ -3,7 +3,6 @@ # Note: # The backup image is a local fs image - - blockdev_inc_backup_without_bitmap: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_inc_backup_xpt_allocation_depth.cfg b/qemu/tests/cfg/blockdev_inc_backup_xpt_allocation_depth.cfg index 924d6dbd79..9dbf5dd401 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_xpt_allocation_depth.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_xpt_allocation_depth.cfg @@ -10,7 +10,6 @@ # Note: # The images to be exported are local fs images - - blockdev_inc_backup_xpt_allocation_depth: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_inc_backup_xpt_bitmap.cfg b/qemu/tests/cfg/blockdev_inc_backup_xpt_bitmap.cfg index 72e9d6badc..3e2d792cf7 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_xpt_bitmap.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_xpt_bitmap.cfg @@ -4,7 +4,6 @@ # Expose persistent bitmap via qemu-nbd # The data image must be a local fs image - - blockdev_inc_backup_xpt_bitmap: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_inc_backup_xpt_multiple_bitmaps.cfg b/qemu/tests/cfg/blockdev_inc_backup_xpt_multiple_bitmaps.cfg index b2b8f69b18..11b9faf2dd 100644 --- a/qemu/tests/cfg/blockdev_inc_backup_xpt_multiple_bitmaps.cfg +++ b/qemu/tests/cfg/blockdev_inc_backup_xpt_multiple_bitmaps.cfg @@ -6,7 +6,6 @@ # Note: # The image to be exported is always a local fs image - - blockdev_inc_backup_xpt_multiple_bitmaps: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_mirror_complete_running_job.cfg b/qemu/tests/cfg/blockdev_mirror_complete_running_job.cfg index e58b05f706..4da76a6be4 100644 --- a/qemu/tests/cfg/blockdev_mirror_complete_running_job.cfg +++ b/qemu/tests/cfg/blockdev_mirror_complete_running_job.cfg @@ -2,7 +2,6 @@ # Completing a running job should fail # The mirror image is a local image(filesystem) - - blockdev_mirror_complete_running_job: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_mirror_filternode.cfg b/qemu/tests/cfg/blockdev_mirror_filternode.cfg index 0885b204f9..45e7620279 100644 --- a/qemu/tests/cfg/blockdev_mirror_filternode.cfg +++ b/qemu/tests/cfg/blockdev_mirror_filternode.cfg @@ -2,7 +2,6 @@ # Block mirror with filter-node-name test # The mirror image is a local image(filesystem) - - blockdev_mirror_filternode: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_mirror_firewall.cfg b/qemu/tests/cfg/blockdev_mirror_firewall.cfg index 5f0e9b504e..fa25f93ff3 100644 --- a/qemu/tests/cfg/blockdev_mirror_firewall.cfg +++ b/qemu/tests/cfg/blockdev_mirror_firewall.cfg @@ -2,7 +2,6 @@ # Block mirror with firewall test # The mirror image is a nbd image - - blockdev_mirror_firewall: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_mirror_hotunplug.cfg b/qemu/tests/cfg/blockdev_mirror_hotunplug.cfg index 0511441768..1a3fc24392 100644 --- a/qemu/tests/cfg/blockdev_mirror_hotunplug.cfg +++ b/qemu/tests/cfg/blockdev_mirror_hotunplug.cfg @@ -2,7 +2,6 @@ # Block mirror with hotunplug test # The mirror image is a local fs image - - blockdev_mirror_hotunplug: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_mirror_no_space.cfg b/qemu/tests/cfg/blockdev_mirror_no_space.cfg index 33cb5978e6..3f79d2ef7d 100644 --- a/qemu/tests/cfg/blockdev_mirror_no_space.cfg +++ b/qemu/tests/cfg/blockdev_mirror_no_space.cfg @@ -2,7 +2,6 @@ # block mirror to an image without enough space # The mirror image is a local image(filesystem) - - blockdev_mirror_no_space: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/blockdev_mirror_ready_vm_down.cfg b/qemu/tests/cfg/blockdev_mirror_ready_vm_down.cfg index 410f80e76e..7f71310c7d 100644 --- a/qemu/tests/cfg/blockdev_mirror_ready_vm_down.cfg +++ b/qemu/tests/cfg/blockdev_mirror_ready_vm_down.cfg @@ -2,7 +2,6 @@ # vm poweroff when mirror job is ready # The mirror image is a local image(filesystem) - - blockdev_mirror_ready_vm_down: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_mirror_remote_server_down.cfg b/qemu/tests/cfg/blockdev_mirror_remote_server_down.cfg index 1fc1180357..36971d61e4 100644 --- a/qemu/tests/cfg/blockdev_mirror_remote_server_down.cfg +++ b/qemu/tests/cfg/blockdev_mirror_remote_server_down.cfg @@ -2,7 +2,6 @@ # Do blockdev-mirror, suspend/resume remote storage service # The mirror image is a on nfs - - blockdev_mirror_remote_server_down: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_mirror_same_src_tgt.cfg b/qemu/tests/cfg/blockdev_mirror_same_src_tgt.cfg index 9a5c543aad..b5f1a33917 100644 --- a/qemu/tests/cfg/blockdev_mirror_same_src_tgt.cfg +++ b/qemu/tests/cfg/blockdev_mirror_same_src_tgt.cfg @@ -1,7 +1,6 @@ # The following testing scenario is covered: # Do block mirror from source node to source node - - blockdev_mirror_same_src_tgt: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/blockdev_mirror_simple.cfg b/qemu/tests/cfg/blockdev_mirror_simple.cfg index 0531713975..80e324a4ba 100644 --- a/qemu/tests/cfg/blockdev_mirror_simple.cfg +++ b/qemu/tests/cfg/blockdev_mirror_simple.cfg @@ -12,7 +12,6 @@ # Note that both are enabled by default, and other block # mirror tests have already covered the default setting - - blockdev_mirror_simple: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_mirror_sync_top.cfg b/qemu/tests/cfg/blockdev_mirror_sync_top.cfg index 5253b45f0d..51a7e6c2a5 100644 --- a/qemu/tests/cfg/blockdev_mirror_sync_top.cfg +++ b/qemu/tests/cfg/blockdev_mirror_sync_top.cfg @@ -2,7 +2,6 @@ # Block mirror with sync mode top test # The mirror image is a local image(filesystem) - - blockdev_mirror_sync_top: only Linux start_vm = no diff --git a/qemu/tests/cfg/blockdev_snapshot_stop_cont.cfg b/qemu/tests/cfg/blockdev_snapshot_stop_cont.cfg index 3d00e841b3..8184fb264d 100644 --- a/qemu/tests/cfg/blockdev_snapshot_stop_cont.cfg +++ b/qemu/tests/cfg/blockdev_snapshot_stop_cont.cfg @@ -15,7 +15,7 @@ node = "drive_image1" overlay = "drive_sn1" qemu_force_use_drive_expression = no - iscsi_direct: + iscsi_direct: enable_iscsi_sn1 = no enable_iscsi_image1 = yes image_raw_device_sn1 = no diff --git a/qemu/tests/cfg/blockdev_stream_backing_file.cfg b/qemu/tests/cfg/blockdev_stream_backing_file.cfg index 646a823d7c..e32a60d1d4 100644 --- a/qemu/tests/cfg/blockdev_stream_backing_file.cfg +++ b/qemu/tests/cfg/blockdev_stream_backing_file.cfg @@ -5,7 +5,6 @@ # backing-file with absolute path # backing-file with relative path - - blockdev_stream_backing_file: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_stream_general.cfg b/qemu/tests/cfg/blockdev_stream_general.cfg index d0cfb3c284..c353b3001b 100644 --- a/qemu/tests/cfg/blockdev_stream_general.cfg +++ b/qemu/tests/cfg/blockdev_stream_general.cfg @@ -2,7 +2,6 @@ # General stream operations test(job-cancel/job-resume/job-pause/auto-finalize/auto-dismiss) # The snapshot image is a local fs image - - blockdev_stream_general: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/blockdev_stream_hotunplug.cfg b/qemu/tests/cfg/blockdev_stream_hotunplug.cfg index 36678e978a..2aa080f2c3 100644 --- a/qemu/tests/cfg/blockdev_stream_hotunplug.cfg +++ b/qemu/tests/cfg/blockdev_stream_hotunplug.cfg @@ -2,7 +2,6 @@ # Hot-unplug the frontend device/format node during stream # The snapshot image is a local fs image - - blockdev_stream_hotunplug: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/blockdev_stream_multiple_blocks.cfg b/qemu/tests/cfg/blockdev_stream_multiple_blocks.cfg index a9b82e990d..698da5cc75 100644 --- a/qemu/tests/cfg/blockdev_stream_multiple_blocks.cfg +++ b/qemu/tests/cfg/blockdev_stream_multiple_blocks.cfg @@ -2,7 +2,6 @@ # Multiple block stream simultaneously # The snapshot images are local fs images - - blockdev_stream_multiple_blocks: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/blockdev_stream_no_backing.cfg b/qemu/tests/cfg/blockdev_stream_no_backing.cfg index af5aae5433..cbc836290f 100644 --- a/qemu/tests/cfg/blockdev_stream_no_backing.cfg +++ b/qemu/tests/cfg/blockdev_stream_no_backing.cfg @@ -1,7 +1,6 @@ # The following testing scenario is covered: # Do block stream to an image without backing file - - blockdev_stream_no_backing: only Linux start_vm = yes diff --git a/qemu/tests/cfg/blockdev_stream_no_space.cfg b/qemu/tests/cfg/blockdev_stream_no_space.cfg index 7c6f04a63b..871a73e70e 100644 --- a/qemu/tests/cfg/blockdev_stream_no_space.cfg +++ b/qemu/tests/cfg/blockdev_stream_no_space.cfg @@ -2,7 +2,6 @@ # block stream on an image without enough space # The snapshot image is a local image(filesystem) - - blockdev_stream_no_space: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/blockdev_stream_none_existed_overlay.cfg b/qemu/tests/cfg/blockdev_stream_none_existed_overlay.cfg index 4fcb5a95d1..e3eea5d53e 100644 --- a/qemu/tests/cfg/blockdev_stream_none_existed_overlay.cfg +++ b/qemu/tests/cfg/blockdev_stream_none_existed_overlay.cfg @@ -1,7 +1,6 @@ # The following testing scenario is covered: # Do block stream to a non-existed snapshot image - - blockdev_stream_none_existed_overlay: only Linux start_vm = yes diff --git a/qemu/tests/cfg/blockdev_stream_on_error_ignore.cfg b/qemu/tests/cfg/blockdev_stream_on_error_ignore.cfg index f432f72e02..ecbccf348a 100644 --- a/qemu/tests/cfg/blockdev_stream_on_error_ignore.cfg +++ b/qemu/tests/cfg/blockdev_stream_on_error_ignore.cfg @@ -2,7 +2,6 @@ # block stream test with on-error:ignore # The snapshot image is a local image(filesystem) - - blockdev_stream_on_error_ignore: only Linux start_vm = yes diff --git a/qemu/tests/cfg/blockdev_stream_remote_server_down.cfg b/qemu/tests/cfg/blockdev_stream_remote_server_down.cfg index 01577840ee..d94167eb58 100644 --- a/qemu/tests/cfg/blockdev_stream_remote_server_down.cfg +++ b/qemu/tests/cfg/blockdev_stream_remote_server_down.cfg @@ -5,7 +5,6 @@ # The snapshot image is a local image(filesystem) # The data image is a nbd image - - blockdev_stream_remote_server_down: only Linux only filesystem diff --git a/qemu/tests/cfg/blockdev_stream_speed.cfg b/qemu/tests/cfg/blockdev_stream_speed.cfg index 8c5af4bd4d..dd4f9603b0 100644 --- a/qemu/tests/cfg/blockdev_stream_speed.cfg +++ b/qemu/tests/cfg/blockdev_stream_speed.cfg @@ -2,7 +2,6 @@ # block stream speed test # The snapshot image is a local image(filesystem) - - blockdev_stream_speed: only Linux start_vm = yes diff --git a/qemu/tests/cfg/blockdev_stream_subchain.cfg b/qemu/tests/cfg/blockdev_stream_subchain.cfg index 08c806d566..bed2fac7f9 100644 --- a/qemu/tests/cfg/blockdev_stream_subchain.cfg +++ b/qemu/tests/cfg/blockdev_stream_subchain.cfg @@ -4,7 +4,6 @@ # The snapshot images are local fs images # block-strem: {device: datasn3, base-node: datasn1} - - blockdev_stream_subchain: only Linux qemu_force_use_drive_expression = no diff --git a/qemu/tests/cfg/cgroup.cfg b/qemu/tests/cfg/cgroup.cfg index 61f20cf55a..e0c3c3b33e 100644 --- a/qemu/tests/cfg/cgroup.cfg +++ b/qemu/tests/cfg/cgroup.cfg @@ -65,7 +65,7 @@ # cgroup_use_half_smp, cgroup_test_time, cgroup_limit, cgroup_cpuset, cgroup_verify cgroup_use_half_smp = 'yes' cgroup_test_time = 10 - ##8.3 will cpu system time. prior to 8.3 will use cpu user time + ##8.3 will cpu system time. prior to 8.3 will use cpu user time cpu_time_type = 2 Host_RHEL.m6,Host_RHEL.m7,Host_RHEL.m8.u0,Host_RHEL.m8.u1,Host_RHEL.m8.u2: cpu_time_type = 0 diff --git a/qemu/tests/cfg/check_link_speed_duplex.cfg b/qemu/tests/cfg/check_link_speed_duplex.cfg index bd0104ff14..ecc952c234 100644 --- a/qemu/tests/cfg/check_link_speed_duplex.cfg +++ b/qemu/tests/cfg/check_link_speed_duplex.cfg @@ -3,7 +3,7 @@ only virtio_net no RHEL.7 type = check_link_speed_duplex - tar_duplex = "full" + tar_duplex = "full" default_tar_speed = 10000 modify_tar_speed = 1000 modify_speed_param = ",speed=${modify_tar_speed},duplex=${tar_duplex}" diff --git a/qemu/tests/cfg/cpu_device_hotplug_test.cfg b/qemu/tests/cfg/cpu_device_hotplug_test.cfg index 1cd1696406..dbd7206411 100644 --- a/qemu/tests/cfg/cpu_device_hotplug_test.cfg +++ b/qemu/tests/cfg/cpu_device_hotplug_test.cfg @@ -37,7 +37,7 @@ - nonexist_vcpu: type = nonexist_vcpu_hotplug nonexist_vcpu = -1 256 - - remove_one_cpu: + - remove_one_cpu: unplug = "yes" - remove_32_cpu: @@ -72,7 +72,7 @@ vcpu_cores = 1 vcpu_threads = 4 vcpu_maxcpus = 240 - + - smp8_c2_t2: smp = 8 used_cpus = 8 diff --git a/qemu/tests/cfg/driver_load.cfg b/qemu/tests/cfg/driver_load.cfg index 7e5fc832ce..a0461f5486 100644 --- a/qemu/tests/cfg/driver_load.cfg +++ b/qemu/tests/cfg/driver_load.cfg @@ -44,7 +44,7 @@ - with_block: drive_format_image1 = ide pseries, aarch64, s390x: - drive_format_image1 = scsi-hd + drive_format_image1 = scsi-hd q35: drive_format_image1 = ahci images += " stg" @@ -61,8 +61,8 @@ cd_format_fixed = ide drive_format_image1 = ide pseries, aarch64, s390x: - cd_format_fixed = scsi-cd - drive_format_image1 = virtio + cd_format_fixed = scsi-cd + drive_format_image1 = virtio q35: cd_format_fixed = ahci drive_format_image1 = ahci diff --git a/qemu/tests/cfg/flag_check.cfg b/qemu/tests/cfg/flag_check.cfg index 21081bae67..69c7a6257f 100644 --- a/qemu/tests/cfg/flag_check.cfg +++ b/qemu/tests/cfg/flag_check.cfg @@ -16,7 +16,7 @@ # use dump_path when you try to download dump file from internet # dump_path = "/tmp" no_check_flags = "kvm_pv_unhalt" - # no_check_flags are kvm features, which won't be exported to guest, and no warning when they are lack in host + # no_check_flags are kvm features, which won't be exported to guest, and no warning when they are lack in host pattern = r"flags:\s+f_edx:(.*)\s+f_ecx:(.*)\s+extf_edx:(.*)\s+extf_ecx(.*)" variants: - basic: diff --git a/qemu/tests/cfg/kernbench2.cfg b/qemu/tests/cfg/kernbench2.cfg index b52eec3220..a97a01adec 100644 --- a/qemu/tests/cfg/kernbench2.cfg +++ b/qemu/tests/cfg/kernbench2.cfg @@ -6,7 +6,7 @@ files_need = kernel re_result = real\s*([0-9\.]*)m([0-9\.]*)s result_file = /tmp/kernbench2_result.log - # Please update following link before running this case. + # Please update following link before running this case. # kernel code unused in testing e.g kernel-2.6.32-59.tar # kernel_link = # kernbench code link kernbench-0.50.tar.gz diff --git a/qemu/tests/cfg/live_snapshot.cfg b/qemu/tests/cfg/live_snapshot.cfg index c29398fb2c..41e2c66ac5 100644 --- a/qemu/tests/cfg/live_snapshot.cfg +++ b/qemu/tests/cfg/live_snapshot.cfg @@ -36,7 +36,7 @@ image_cluster_size = 4096 after_finished = "reboot verify_alive" - node_name: - no Host_RHEL.m5, Host_RHEL.m6 + no Host_RHEL.m5, Host_RHEL.m6 node_name = node1 snapshot_node_name = node2 - with_runtime: diff --git a/qemu/tests/cfg/netkvm_cpu_mapping.cfg b/qemu/tests/cfg/netkvm_cpu_mapping.cfg index a8f593a27a..f5f9cfdcb0 100644 --- a/qemu/tests/cfg/netkvm_cpu_mapping.cfg +++ b/qemu/tests/cfg/netkvm_cpu_mapping.cfg @@ -1,4 +1,4 @@ -- netkvm_cpu_mapping: +- netkvm_cpu_mapping: virt_test_type = qemu type = netkvm_cpu_mapping only virtio_net diff --git a/qemu/tests/cfg/nfs_perf.cfg b/qemu/tests/cfg/nfs_perf.cfg index 33ee9a19b2..205ca576f3 100644 --- a/qemu/tests/cfg/nfs_perf.cfg +++ b/qemu/tests/cfg/nfs_perf.cfg @@ -4,7 +4,7 @@ type = nfs_perf # The following 2 parameters are the nfs server address # and partition, you must modify them before you run - # this test. Normally the nfs server is located on + # this test. Normally the nfs server is located on # another machine, but you still can setup a nfs server # on the host which runs the guest. nfs_server = "ip_of_nfs_server" diff --git a/qemu/tests/cfg/numa_cpu.cfg b/qemu/tests/cfg/numa_cpu.cfg index cfc89073db..9e1abb79f6 100644 --- a/qemu/tests/cfg/numa_cpu.cfg +++ b/qemu/tests/cfg/numa_cpu.cfg @@ -46,184 +46,184 @@ size_mem = 1024M guest_numa_cpus = "cpu0 cpu1 cpu2 cpu3" variants: - - @default: - # For ppc, codeid must be a multiple of 'vcpu_threads' - ppc64, ppc64le: - numa_cpu_nodeid_cpu0 = 0 - numa_cpu_coreid_cpu0 = 0 - - numa_cpu_nodeid_cpu1 = 1 - numa_cpu_coreid_cpu1 = 2 - - numa_cpu_nodeid_cpu2 = 2 - numa_cpu_coreid_cpu2 = 4 - - numa_cpu_nodeid_cpu3 = 3 - numa_cpu_coreid_cpu3 = 6 - x86_64, i386: - numa_cpu_nodeid_cpu0 = 0 - numa_cpu_socketid_cpu0 = 0 - - numa_cpu_nodeid_cpu1 = 1 - numa_cpu_socketid_cpu1 = 1 - numa_cpu_dieid_cpu1 = 0 - - numa_cpu_nodeid_cpu2 = 2 - numa_cpu_socketid_cpu2 = 1 - numa_cpu_dieid_cpu2 = 1 - numa_cpu_coreid_cpu2 = 0 - - numa_cpu_nodeid_cpu3 = 3 - numa_cpu_socketid_cpu3 = 1 - numa_cpu_dieid_cpu3 = 1 - numa_cpu_coreid_cpu3 = 1 - HostCpuVendor.intel: - numa_cpu_threadid_cpu3 = 0 - - guest_numa_cpus += " cpu4" - numa_cpu_nodeid_cpu4 = 3 - numa_cpu_socketid_cpu4 = 1 - numa_cpu_dieid_cpu4 = 1 - numa_cpu_coreid_cpu4 = 1 - numa_cpu_threadid_cpu4 = 1 - aarch64: - guest_numa_cpus += " cpu4 cpu5 cpu6 cpu7 cpu8 cpu9 cpu10 cpu11 cpu12 cpu13 cpu14 cpu15" - numa_cpu_nodeid_cpu0 = 0 - numa_cpu_socketid_cpu0 = 0 - numa_cpu_clusterid_cpu0 = 0 - numa_cpu_coreid_cpu0 = 0 - numa_cpu_threadid_cpu0 = 0 - - numa_cpu_nodeid_cpu1 = 0 - numa_cpu_socketid_cpu1 = 0 - numa_cpu_clusterid_cpu1 = 0 - numa_cpu_coreid_cpu1 = 0 - numa_cpu_threadid_cpu1 = 1 - - numa_cpu_nodeid_cpu2 = 0 - numa_cpu_socketid_cpu2 = 0 - numa_cpu_clusterid_cpu2 = 0 - numa_cpu_coreid_cpu2 = 1 - numa_cpu_threadid_cpu2 = 0 - - numa_cpu_nodeid_cpu3 = 0 - numa_cpu_socketid_cpu3 = 0 - numa_cpu_clusterid_cpu3 = 0 - numa_cpu_coreid_cpu3 = 1 - numa_cpu_threadid_cpu3 = 1 - - numa_cpu_nodeid_cpu4 = 1 - numa_cpu_socketid_cpu4 = 0 - numa_cpu_clusterid_cpu4 = 1 - numa_cpu_coreid_cpu4 = 0 - numa_cpu_threadid_cpu4 = 0 - - numa_cpu_nodeid_cpu5 = 1 - numa_cpu_socketid_cpu5 = 0 - numa_cpu_clusterid_cpu5 = 1 - numa_cpu_coreid_cpu5 = 0 - numa_cpu_threadid_cpu5 = 1 - - numa_cpu_nodeid_cpu6 = 1 - numa_cpu_socketid_cpu6 = 0 - numa_cpu_clusterid_cpu6 = 1 - numa_cpu_coreid_cpu6 = 1 - numa_cpu_threadid_cpu6 = 0 - - numa_cpu_nodeid_cpu7 = 1 - numa_cpu_socketid_cpu7 = 0 - numa_cpu_clusterid_cpu7 = 1 - numa_cpu_coreid_cpu7 = 1 - numa_cpu_threadid_cpu7 = 1 - - numa_cpu_nodeid_cpu8 = 2 - numa_cpu_socketid_cpu8 = 1 - numa_cpu_clusterid_cpu8 = 0 - numa_cpu_coreid_cpu8 = 0 - numa_cpu_threadid_cpu8 = 0 - - numa_cpu_nodeid_cpu9 = 2 - numa_cpu_socketid_cpu9 = 1 - numa_cpu_clusterid_cpu9 = 0 - numa_cpu_coreid_cpu9 = 0 - numa_cpu_threadid_cpu9 = 1 - - numa_cpu_nodeid_cpu10 = 2 - numa_cpu_socketid_cpu10 = 1 - numa_cpu_clusterid_cpu10 = 0 - numa_cpu_coreid_cpu10 = 1 - numa_cpu_threadid_cpu10 = 0 - - numa_cpu_nodeid_cpu11 = 2 - numa_cpu_socketid_cpu11 = 1 - numa_cpu_clusterid_cpu11 = 0 - numa_cpu_coreid_cpu11 = 1 - numa_cpu_threadid_cpu11 = 1 - - numa_cpu_nodeid_cpu12 = 3 - numa_cpu_socketid_cpu12 = 1 - numa_cpu_clusterid_cpu12 = 1 - numa_cpu_coreid_cpu12 = 0 - numa_cpu_threadid_cpu12 = 0 - - numa_cpu_nodeid_cpu13 = 3 - numa_cpu_socketid_cpu13 = 1 - numa_cpu_clusterid_cpu13 = 1 - numa_cpu_coreid_cpu13 = 0 - numa_cpu_threadid_cpu13 = 1 - - numa_cpu_nodeid_cpu14 = 3 - numa_cpu_socketid_cpu14 = 1 - numa_cpu_clusterid_cpu14 = 1 - numa_cpu_coreid_cpu14 = 1 - numa_cpu_threadid_cpu14 = 0 - - numa_cpu_nodeid_cpu15 = 3 - numa_cpu_socketid_cpu15 = 1 - numa_cpu_clusterid_cpu15 = 1 - numa_cpu_coreid_cpu15 = 1 - numa_cpu_threadid_cpu15 = 1 - - with_preconfig: - qemu_preconfig = on - # Skip this test since hot plug cpus has not been - # enabled on the arm platform. - no aarch64 - # Ensure all node have corresponding cpu in qemu cli - ppc64le, ppc64: - vcpu_sockets = 4 - vcpu_threads = 1 - numa_cpu_nodeid_cpu0 = 0 - numa_cpu_coreid_cpu0 = 0 - - numa_cpu_nodeid_cpu1 = 1 - numa_cpu_coreid_cpu1 = 2 - - numa_cpu_nodeid_cpu2 = 2 - numa_cpu_coreid_cpu2 = 4 - - numa_cpu_nodeid_cpu3 = 3 - numa_cpu_coreid_cpu3 = 6 - x86_64, i386: - numa_cpu_nodeid_cpu0 = 0 - numa_cpu_socketid_cpu0 = 0 - numa_cpu_dieid_cpu0 = 0 - numa_cpu_coreid_cpu0 = 0 - numa_cpu_threadid_cpu0 = 0 - - numa_cpu_nodeid_cpu1 = 1 - numa_cpu_socketid_cpu1 = 0 - numa_cpu_dieid_cpu1 = 1 - numa_cpu_coreid_cpu1 = 0 - numa_cpu_threadid_cpu1 = 0 - - numa_cpu_nodeid_cpu2 = 2 - numa_cpu_socketid_cpu2 = 1 - numa_cpu_dieid_cpu2 = 0 - numa_cpu_coreid_cpu2 = 0 - numa_cpu_threadid_cpu2 = 0 - - numa_cpu_nodeid_cpu3 = 3 - numa_cpu_socketid_cpu3 = 1 - numa_cpu_dieid_cpu3 = 1 - numa_cpu_coreid_cpu3 = 0 - numa_cpu_threadid_cpu3 = 0 + - @default: + # For ppc, codeid must be a multiple of 'vcpu_threads' + ppc64, ppc64le: + numa_cpu_nodeid_cpu0 = 0 + numa_cpu_coreid_cpu0 = 0 + + numa_cpu_nodeid_cpu1 = 1 + numa_cpu_coreid_cpu1 = 2 + + numa_cpu_nodeid_cpu2 = 2 + numa_cpu_coreid_cpu2 = 4 + + numa_cpu_nodeid_cpu3 = 3 + numa_cpu_coreid_cpu3 = 6 + x86_64, i386: + numa_cpu_nodeid_cpu0 = 0 + numa_cpu_socketid_cpu0 = 0 + + numa_cpu_nodeid_cpu1 = 1 + numa_cpu_socketid_cpu1 = 1 + numa_cpu_dieid_cpu1 = 0 + + numa_cpu_nodeid_cpu2 = 2 + numa_cpu_socketid_cpu2 = 1 + numa_cpu_dieid_cpu2 = 1 + numa_cpu_coreid_cpu2 = 0 + + numa_cpu_nodeid_cpu3 = 3 + numa_cpu_socketid_cpu3 = 1 + numa_cpu_dieid_cpu3 = 1 + numa_cpu_coreid_cpu3 = 1 + HostCpuVendor.intel: + numa_cpu_threadid_cpu3 = 0 + + guest_numa_cpus += " cpu4" + numa_cpu_nodeid_cpu4 = 3 + numa_cpu_socketid_cpu4 = 1 + numa_cpu_dieid_cpu4 = 1 + numa_cpu_coreid_cpu4 = 1 + numa_cpu_threadid_cpu4 = 1 + aarch64: + guest_numa_cpus += " cpu4 cpu5 cpu6 cpu7 cpu8 cpu9 cpu10 cpu11 cpu12 cpu13 cpu14 cpu15" + numa_cpu_nodeid_cpu0 = 0 + numa_cpu_socketid_cpu0 = 0 + numa_cpu_clusterid_cpu0 = 0 + numa_cpu_coreid_cpu0 = 0 + numa_cpu_threadid_cpu0 = 0 + + numa_cpu_nodeid_cpu1 = 0 + numa_cpu_socketid_cpu1 = 0 + numa_cpu_clusterid_cpu1 = 0 + numa_cpu_coreid_cpu1 = 0 + numa_cpu_threadid_cpu1 = 1 + + numa_cpu_nodeid_cpu2 = 0 + numa_cpu_socketid_cpu2 = 0 + numa_cpu_clusterid_cpu2 = 0 + numa_cpu_coreid_cpu2 = 1 + numa_cpu_threadid_cpu2 = 0 + + numa_cpu_nodeid_cpu3 = 0 + numa_cpu_socketid_cpu3 = 0 + numa_cpu_clusterid_cpu3 = 0 + numa_cpu_coreid_cpu3 = 1 + numa_cpu_threadid_cpu3 = 1 + + numa_cpu_nodeid_cpu4 = 1 + numa_cpu_socketid_cpu4 = 0 + numa_cpu_clusterid_cpu4 = 1 + numa_cpu_coreid_cpu4 = 0 + numa_cpu_threadid_cpu4 = 0 + + numa_cpu_nodeid_cpu5 = 1 + numa_cpu_socketid_cpu5 = 0 + numa_cpu_clusterid_cpu5 = 1 + numa_cpu_coreid_cpu5 = 0 + numa_cpu_threadid_cpu5 = 1 + + numa_cpu_nodeid_cpu6 = 1 + numa_cpu_socketid_cpu6 = 0 + numa_cpu_clusterid_cpu6 = 1 + numa_cpu_coreid_cpu6 = 1 + numa_cpu_threadid_cpu6 = 0 + + numa_cpu_nodeid_cpu7 = 1 + numa_cpu_socketid_cpu7 = 0 + numa_cpu_clusterid_cpu7 = 1 + numa_cpu_coreid_cpu7 = 1 + numa_cpu_threadid_cpu7 = 1 + + numa_cpu_nodeid_cpu8 = 2 + numa_cpu_socketid_cpu8 = 1 + numa_cpu_clusterid_cpu8 = 0 + numa_cpu_coreid_cpu8 = 0 + numa_cpu_threadid_cpu8 = 0 + + numa_cpu_nodeid_cpu9 = 2 + numa_cpu_socketid_cpu9 = 1 + numa_cpu_clusterid_cpu9 = 0 + numa_cpu_coreid_cpu9 = 0 + numa_cpu_threadid_cpu9 = 1 + + numa_cpu_nodeid_cpu10 = 2 + numa_cpu_socketid_cpu10 = 1 + numa_cpu_clusterid_cpu10 = 0 + numa_cpu_coreid_cpu10 = 1 + numa_cpu_threadid_cpu10 = 0 + + numa_cpu_nodeid_cpu11 = 2 + numa_cpu_socketid_cpu11 = 1 + numa_cpu_clusterid_cpu11 = 0 + numa_cpu_coreid_cpu11 = 1 + numa_cpu_threadid_cpu11 = 1 + + numa_cpu_nodeid_cpu12 = 3 + numa_cpu_socketid_cpu12 = 1 + numa_cpu_clusterid_cpu12 = 1 + numa_cpu_coreid_cpu12 = 0 + numa_cpu_threadid_cpu12 = 0 + + numa_cpu_nodeid_cpu13 = 3 + numa_cpu_socketid_cpu13 = 1 + numa_cpu_clusterid_cpu13 = 1 + numa_cpu_coreid_cpu13 = 0 + numa_cpu_threadid_cpu13 = 1 + + numa_cpu_nodeid_cpu14 = 3 + numa_cpu_socketid_cpu14 = 1 + numa_cpu_clusterid_cpu14 = 1 + numa_cpu_coreid_cpu14 = 1 + numa_cpu_threadid_cpu14 = 0 + + numa_cpu_nodeid_cpu15 = 3 + numa_cpu_socketid_cpu15 = 1 + numa_cpu_clusterid_cpu15 = 1 + numa_cpu_coreid_cpu15 = 1 + numa_cpu_threadid_cpu15 = 1 + - with_preconfig: + qemu_preconfig = on + # Skip this test since hot plug cpus has not been + # enabled on the arm platform. + no aarch64 + # Ensure all node have corresponding cpu in qemu cli + ppc64le, ppc64: + vcpu_sockets = 4 + vcpu_threads = 1 + numa_cpu_nodeid_cpu0 = 0 + numa_cpu_coreid_cpu0 = 0 + + numa_cpu_nodeid_cpu1 = 1 + numa_cpu_coreid_cpu1 = 2 + + numa_cpu_nodeid_cpu2 = 2 + numa_cpu_coreid_cpu2 = 4 + + numa_cpu_nodeid_cpu3 = 3 + numa_cpu_coreid_cpu3 = 6 + x86_64, i386: + numa_cpu_nodeid_cpu0 = 0 + numa_cpu_socketid_cpu0 = 0 + numa_cpu_dieid_cpu0 = 0 + numa_cpu_coreid_cpu0 = 0 + numa_cpu_threadid_cpu0 = 0 + + numa_cpu_nodeid_cpu1 = 1 + numa_cpu_socketid_cpu1 = 0 + numa_cpu_dieid_cpu1 = 1 + numa_cpu_coreid_cpu1 = 0 + numa_cpu_threadid_cpu1 = 0 + + numa_cpu_nodeid_cpu2 = 2 + numa_cpu_socketid_cpu2 = 1 + numa_cpu_dieid_cpu2 = 0 + numa_cpu_coreid_cpu2 = 0 + numa_cpu_threadid_cpu2 = 0 + + numa_cpu_nodeid_cpu3 = 3 + numa_cpu_socketid_cpu3 = 1 + numa_cpu_dieid_cpu3 = 1 + numa_cpu_coreid_cpu3 = 0 + numa_cpu_threadid_cpu3 = 0 diff --git a/qemu/tests/cfg/openflow_acl_test.cfg b/qemu/tests/cfg/openflow_acl_test.cfg index b2040ee0c2..eba7d74e9a 100644 --- a/qemu/tests/cfg/openflow_acl_test.cfg +++ b/qemu/tests/cfg/openflow_acl_test.cfg @@ -74,14 +74,14 @@ guest_port_remote_shell = ${target_port} host_username = root Windows: - quit_cmd = quit - copy_scripts = telnet.py wait_for_quit.py + quit_cmd = quit + copy_scripts = telnet.py wait_for_quit.py stop_cmd_windows = net stop telnet setup_targets = virt-tests-vm1 virt-tests-vm2 localhost Win10,Win2016,Win2019: - setup_cmd_windows = start /w pkgmgr /iu:TelnetClient - setup_targets = virt-tests-vm1 localhost - stop_cmd_windows = + setup_cmd_windows = start /w pkgmgr /iu:TelnetClient + setup_targets = virt-tests-vm1 localhost + stop_cmd_windows = variants: - access_deny_all_target: acl_disabled = yes diff --git a/qemu/tests/cfg/pvpanic.cfg b/qemu/tests/cfg/pvpanic.cfg index 9d91f31df0..1265fbe82d 100644 --- a/qemu/tests/cfg/pvpanic.cfg +++ b/qemu/tests/cfg/pvpanic.cfg @@ -10,7 +10,7 @@ crash_method = nmi timeout = 360 wait_bg_time = 720 - run_bg_flag = "before_bg_test" + run_bg_flag = "before_bg_test" clone_master = yes master_images_clone = image1 remove_image_image1 = yes diff --git a/qemu/tests/cfg/pvpanic_basic.cfg b/qemu/tests/cfg/pvpanic_basic.cfg index 37832c027b..428854f686 100644 --- a/qemu/tests/cfg/pvpanic_basic.cfg +++ b/qemu/tests/cfg/pvpanic_basic.cfg @@ -22,7 +22,7 @@ set_panic_cmd = "echo 1 > /proc/sys/kernel/unknown_nmi_panic" ppc64, ppc64le: set_panic_cmd = "echo 1 > /proc/sys/kernel/nmi_watchdog" - Windows: + Windows: set_panic_cmd = 'wmic class stdregprov call SetDwordValue hDefKey="&h80000002" sSubKeyName="SYSTEM\CurrentControlSet\Control\CrashControl" sValueName="NMICrashDump" uValue=1' variants: - @default: diff --git a/qemu/tests/cfg/pvpanic_memory_leak.cfg b/qemu/tests/cfg/pvpanic_memory_leak.cfg index 365796a58a..283c96a189 100644 --- a/qemu/tests/cfg/pvpanic_memory_leak.cfg +++ b/qemu/tests/cfg/pvpanic_memory_leak.cfg @@ -4,8 +4,8 @@ type = pvpanic_memory_leak driver_name = pvpanic i386, i686: - devcon_dirname = 'x86' + devcon_dirname = 'x86' x86_64: - devcon_dirname = 'amd64' + devcon_dirname = 'amd64' devcon_path = "WIN_UTILS:\devcon\${devcon_dirname}\devcon.exe" cdroms += " virtio" diff --git a/qemu/tests/cfg/qcow2perf.cfg b/qemu/tests/cfg/qcow2perf.cfg index 7e51190467..2cd8f20757 100644 --- a/qemu/tests/cfg/qcow2perf.cfg +++ b/qemu/tests/cfg/qcow2perf.cfg @@ -26,7 +26,7 @@ opcmd = "time strace -c qemu-img convert -f qcow2 %s -O qcow2 -t %s %s" variants: - default_test: - only Host_RHEL.m5 + only Host_RHEL.m5 - cache_none: no Host_RHEL.m5 cache_mode = none diff --git a/qemu/tests/cfg/qemu_cpu.cfg b/qemu/tests/cfg/qemu_cpu.cfg index 79547b80aa..7cfb2cdb62 100644 --- a/qemu/tests/cfg/qemu_cpu.cfg +++ b/qemu/tests/cfg/qemu_cpu.cfg @@ -271,7 +271,6 @@ cpu_model_amd.Opteron_G5: no machine_type_rhel.rhel6.rhel600, machine_type_rhel.rhel6.rhel610, machine_type_rhel.rhel6.rhel620, machine_type_rhel.rhel6.rhel630 - variants dump_method: - qom: qom_mode = "yes" @@ -355,7 +354,6 @@ ignore_cpuid_leaves += " 0x80000001,0x00,edx,23" ignore_cpuid_leaves += " 0x80000001,0x00,edx,24" - #FEATURE: Ignore vendor string on KVM because it depends on host # CPU vendor: kvm: @@ -445,7 +443,6 @@ ignore_cpuid_leaves += " 0x80000001,0x00,edx,23" ignore_cpuid_leaves += " 0x80000001,0x00,edx,24" - #FIXED BUG: RHEL-7.2 and older had feature aliases set on # some Intel CPU models. It was fixed without any compat code machine_type_rhel.rhel6, machine_type_rhel.rhel7.rhel700, machine_type_rhel.rhel7.rhel710, machine_type_rhel.rhel7.rhel720: diff --git a/qemu/tests/cfg/qemu_img_convert_with_backing_file.cfg b/qemu/tests/cfg/qemu_img_convert_with_backing_file.cfg index 587e27aaf4..f7edbfb1cc 100644 --- a/qemu/tests/cfg/qemu_img_convert_with_backing_file.cfg +++ b/qemu/tests/cfg/qemu_img_convert_with_backing_file.cfg @@ -21,7 +21,7 @@ convert_target = convert image_name_convert = "images/convert_to_qcow2" image_format_convert = qcow2 - skip_target_creation = yes + skip_target_creation = yes image += " sn2" image_chain2 = "convert sn2" image_name_sn2 = "images/sn2" diff --git a/qemu/tests/cfg/qsd_vubp_options.cfg b/qemu/tests/cfg/qsd_vubp_options.cfg index 812c495340..32a97acf25 100644 --- a/qemu/tests/cfg/qsd_vubp_options.cfg +++ b/qemu/tests/cfg/qsd_vubp_options.cfg @@ -25,13 +25,13 @@ ovmf: no i440fx variants: - - with_mix_aim_off: - image_vubp_props_stg1 = {"num-queues":1,"bootindex":2,"queue-size":128, - image_vubp_props_stg1 += "ats":"off","event_idx":"on","iommu_platform":"off", - image_vubp_props_stg1 += "packed":"off","indirect_desc":"off","multifunction":"off"} - - with_mix_aim_on: - image_vubp_props_stg1 = {"num-queues":1,"bootindex":2,"queue-size":1024, - image_vubp_props_stg1 += "ats":"on","event_idx":"off","iommu_platform":"off", - image_vubp_props_stg1 += "packed":"off","indirect_desc":"on","multifunction":"on"} - - with_packed: - image_vubp_props_stg1 = {"num-queues":1,"bootindex":2,"packed":"on"} + - with_mix_aim_off: + image_vubp_props_stg1 = {"num-queues":1,"bootindex":2,"queue-size":128, + image_vubp_props_stg1 += "ats":"off","event_idx":"on","iommu_platform":"off", + image_vubp_props_stg1 += "packed":"off","indirect_desc":"off","multifunction":"off"} + - with_mix_aim_on: + image_vubp_props_stg1 = {"num-queues":1,"bootindex":2,"queue-size":1024, + image_vubp_props_stg1 += "ats":"on","event_idx":"off","iommu_platform":"off", + image_vubp_props_stg1 += "packed":"off","indirect_desc":"on","multifunction":"on"} + - with_packed: + image_vubp_props_stg1 = {"num-queues":1,"bootindex":2,"packed":"on"} diff --git a/qemu/tests/cfg/rng_read_longtime.cfg b/qemu/tests/cfg/rng_read_longtime.cfg index 8efdabe2a4..c3cfd25f2d 100644 --- a/qemu/tests/cfg/rng_read_longtime.cfg +++ b/qemu/tests/cfg/rng_read_longtime.cfg @@ -10,7 +10,7 @@ #rng_dll_register_cmd = if not exist "C:\Windows\system32\viorngum.dll" copy PATH:\INCLUDEDRIVER\viorngum.dll C:\Windows\system32\ /y &&" session_cmd_timeout = 240 rng_dst = "c:\random_%PROCESSOR_ARCHITECTURE%.exe" - read_rng_cmd = for /l %i in (1, 1, 1000) do ${rng_dst} + read_rng_cmd = for /l %i in (1, 1, 1000) do ${rng_dst} driver_name = "viorng" rng_data_rex = "0x\w" driver_id_pattern = "(.*?):.*?VirtIO RNG Device" diff --git a/qemu/tests/cfg/rng_stress.cfg b/qemu/tests/cfg/rng_stress.cfg index 33f180133a..584ce7cec3 100644 --- a/qemu/tests/cfg/rng_stress.cfg +++ b/qemu/tests/cfg/rng_stress.cfg @@ -45,11 +45,11 @@ pre_cmd = "dd if=/dev/random of=/dev/null bs=10 count=10" post_cmd = "dd if=/dev/random of=/dev/null bs=10 count=10" rng_builtin: - backend_rng1 = rng-builtin + backend_rng1 = rng-builtin rng_random: - backend_rng1 = rng-random + backend_rng1 = rng-random rng_egd: - backend_rng1 = rng-egd + backend_rng1 = rng-egd - one_device: pre_cmd = "dd if=/dev/random of=/dev/null &" post_cmd = "pkill dd" diff --git a/qemu/tests/cfg/rv.cfg b/qemu/tests/cfg/rv.cfg index 171b00171d..620dbf2b8a 100644 --- a/qemu/tests/cfg/rv.cfg +++ b/qemu/tests/cfg/rv.cfg @@ -12,7 +12,7 @@ chardev_name_vdagent0 = "vdagent" chardev_backend_vdagent0 = "spicevmc" virtio_port_name_prefix_vdagent0 = "com.redhat.spice." - + variants: - RHEL-6-devel-x86_64: image_name_vm2 = images/rhel6devel-64_client @@ -113,7 +113,7 @@ kill_vm_gracefully = no variants: - #variant for a RHEL client and a RHEL guest + #variant for a RHEL client and a RHEL guest -rr: #variant for a RHEL client and a Windows guest -rw: @@ -131,4 +131,3 @@ -wr: #variant for a Windows client and a Windows guest -ww: - diff --git a/qemu/tests/cfg/s390x_cpu_model.cfg b/qemu/tests/cfg/s390x_cpu_model.cfg index 3bd5077dbb..894a10c451 100644 --- a/qemu/tests/cfg/s390x_cpu_model.cfg +++ b/qemu/tests/cfg/s390x_cpu_model.cfg @@ -9,26 +9,26 @@ - expansion: type = s390x_cpu_model_expansion variants: - - model_type_z196_z196_2_z114: + - model_type_z196_z196_2_z114: cpu_models = "z196 z196.2 z114" props = 'aefsi=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ipter=True bpb=True ppa15=True cmm=True' - - model_type_zEC12_zEC12_2_zBC12: + - model_type_zEC12_zEC12_2_zBC12: cpu_models = "zEC12 zEC12.2 zBC12" props = 'aen=True aefsi=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True edat2=True ipter=True esop=True cte=True bpb=True ppa15=True zpci=True sea_esop2=True te=True cmm=True' - - model_type_z13_z13_2_z13s: + - model_type_z13_z13_2_z13s: cpu_models = "z13 z13.2 z13s" props = 'aen=True aefsi=True msa5=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True edat2=True vx=True ipter=True esop=True cte=True bpb=True ppa15=True zpci=True sea_esop2=True te=True cmm=True' - - model_type_z14_z14_2_z14ZR1: + - model_type_z14_z14_2_z14ZR1: cpu_models = "z14 z14.2 z14ZR1" props = 'aen=True aefsi=True mepoch=True msa8=True msa7=True msa6=True msa5=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True edat2=True vx=True ipter=True mepochptff=True vxeh=True vxpd=True esop=True iep=True cte=True bpb=True gs=True ppa15=True zpci=True sea_esop2=True te=True cmm=True' - - model_type_gen15a_gen15b: + - model_type_gen15a_gen15b: cpu_models = "gen15a gen15b" props = 'aen=True vxpdeh=True aefsi=True mepoch=True msa9=True msa8=True msa7=True msa6=True msa5=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True deflate=True edat2=True etoken=True vx=True ipter=True mepochptff=True vxeh=True vxpd=True esop=True msa9_pckmo=True vxeh2=True iep=True cte=True gs=True ppa15=True zpci=True sea_esop2=True te=True cmm=True' - - model_type_gen16a_gen16b: + - model_type_gen16a_gen16b: required_qemu = (,7.1.0] cpu_models = "gen16a gen16b" props = 'nnpa=True aen=True vxpdeh=True aefsi=True mepoch=True msa9=True msa8=True msa7=True msa6=True msa5=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True deflate=True edat2=True etoken=True vx=True ipter=True pai=True mepochptff=True vxeh=True vxpd=True esop=True msa9_pckmo=True vxeh2=True iep=True cte=True gs=True ppa15=True zpci=True rdp=True sea_esop2=True beareh=True te=True cmm=True vxpdeh2=True' - - model_type_gen16a_gen16b_with_paie: + - model_type_gen16a_gen16b_with_paie: required_qemu = (7.1.0,) cpu_models = "gen16a gen16b" props = 'nnpa=True aen=True vxpdeh=True aefsi=True mepoch=True msa9=True msa8=True msa7=True msa6=True msa5=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True deflate=True edat2=True etoken=True vx=True ipter=True pai=True paie=True mepochptff=True vxeh=True vxpd=True esop=True msa9_pckmo=True vxeh2=True iep=True cte=True gs=True ppa15=True zpci=True rdp=True sea_esop2=True beareh=True te=True cmm=True vxpdeh2=True' diff --git a/qemu/tests/cfg/system_powerdown.cfg b/qemu/tests/cfg/system_powerdown.cfg index 9c153fba9f..607db9ae91 100644 --- a/qemu/tests/cfg/system_powerdown.cfg +++ b/qemu/tests/cfg/system_powerdown.cfg @@ -4,4 +4,4 @@ sleep_before_powerdown = 20 kill_vm = yes Linux: - setup_runlevel = yes + setup_runlevel = yes diff --git a/qemu/tests/cfg/systemtap_tracing.cfg b/qemu/tests/cfg/systemtap_tracing.cfg index 995d754640..c72fd2818a 100644 --- a/qemu/tests/cfg/systemtap_tracing.cfg +++ b/qemu/tests/cfg/systemtap_tracing.cfg @@ -159,7 +159,7 @@ probe_var_key = addr c h dtc i stap_script_file = usb_ehci_qh_bits.stp - usb_ehci_qh_ptrs: - probe_var_key = q addr nxt c_qtd n_qtd a_qtd + probe_var_key = q addr nxt c_qtd n_qtd a_qtd stap_script_file = usb_ehci_qh_ptrs.stp - usb_ehci_qtd_bits: probe_var_key = addr ioc active halt babble xacterr diff --git a/qemu/tests/cfg/test_SMM_enabled.cfg b/qemu/tests/cfg/test_SMM_enabled.cfg index 01de7cb8e9..019d2420f4 100644 --- a/qemu/tests/cfg/test_SMM_enabled.cfg +++ b/qemu/tests/cfg/test_SMM_enabled.cfg @@ -1,5 +1,5 @@ - test_SMM_enabled: - auto_cpu_policy = "virttest" + auto_cpu_policy = "virttest" type = test_SMM_enabled no Host_RHEL.6 Host_RHEL.7 Host_RHEL.8.u0 Host_RHEL.m8.u1 Host_RHEL.m8.u2 Host_RHEL.m8.u3 Host_RHEL.m8.u4 Host_RHEL.m8.u5 Host_RHEL.m8.u6 start_vm = no diff --git a/qemu/tests/cfg/throttle_multi_guests_parameter_test.cfg b/qemu/tests/cfg/throttle_multi_guests_parameter_test.cfg index 92d694e310..cd9c4b1a61 100644 --- a/qemu/tests/cfg/throttle_multi_guests_parameter_test.cfg +++ b/qemu/tests/cfg/throttle_multi_guests_parameter_test.cfg @@ -51,30 +51,30 @@ throttle_group_member_group1 = "stg1 stg2" throttle_group_member_group2 = "stg3 stg4" variants: - - normal_rw_with_iops_bps_rw: - group1 = {"bps-read":163840,"iops-read":20,"bps-write":163840,"iops-write":20} - group2 = {"bps-read":204800,"iops-read":25,"bps-write":204800,"iops-write":25} - aarch64,ppc64,ppc64le: - throttle_runtime = 300 - - burst_rw_with_iops_bps: - group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"bps-total-max":204800,"bps-total-max-length":10} - group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":10,"bps-total-max":245760,"bps-total-max-length":10} - aarch64,ppc64,ppc64le: - group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":30,"bps-total-max":204800,"bps-total-max-length":30} - group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":30,"bps-total-max":245760,"bps-total-max-length":30} - - mix: - throttle_groups = "group1" - images_vm1 = "vm1sys stg1 stg2" - images_vm2 = "vm2sys stg1 stg2" - variants: - - with_iops_size: - group1 = {"iops-total":60,"iops-size":8192} - - with_iops_size_burst: - group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"iops-size":8192} - aarch64,ppc64,ppc64le: - group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":30,"iops-size":8192} - - with_iops_bps_all: - group1 = {"iops-read":20,"iops-read-max":30,"iops-read-max-length":20,"iops-write":20,"iops-write-max":30,"iops-write-max-length":20,"bps-read":163840,"bps-read-max":204800,"bps-read-max-length":20,"bps-write":163840,"bps-write-max":204800,"bps-write-max-length":20} + - normal_rw_with_iops_bps_rw: + group1 = {"bps-read":163840,"iops-read":20,"bps-write":163840,"iops-write":20} + group2 = {"bps-read":204800,"iops-read":25,"bps-write":204800,"iops-write":25} + aarch64,ppc64,ppc64le: + throttle_runtime = 300 + - burst_rw_with_iops_bps: + group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"bps-total-max":204800,"bps-total-max-length":10} + group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":10,"bps-total-max":245760,"bps-total-max-length":10} + aarch64,ppc64,ppc64le: + group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":30,"bps-total-max":204800,"bps-total-max-length":30} + group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":30,"bps-total-max":245760,"bps-total-max-length":30} + - mix: + throttle_groups = "group1" + images_vm1 = "vm1sys stg1 stg2" + images_vm2 = "vm2sys stg1 stg2" + variants: + - with_iops_size: + group1 = {"iops-total":60,"iops-size":8192} + - with_iops_size_burst: + group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"iops-size":8192} + aarch64,ppc64,ppc64le: + group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":30,"iops-size":8192} + - with_iops_bps_all: + group1 = {"iops-read":20,"iops-read-max":30,"iops-read-max-length":20,"iops-write":20,"iops-write-max":30,"iops-write-max-length":20,"bps-read":163840,"bps-read-max":204800,"bps-read-max-length":20,"bps-write":163840,"bps-write-max":204800,"bps-write-max-length":20} throttle_group_parameters_group1 = ${group1} throttle_group_parameters_group2 = ${group2} diff --git a/qemu/tests/cfg/throttle_operation_test.cfg b/qemu/tests/cfg/throttle_operation_test.cfg index 290f6d184c..131db3665b 100644 --- a/qemu/tests/cfg/throttle_operation_test.cfg +++ b/qemu/tests/cfg/throttle_operation_test.cfg @@ -37,45 +37,45 @@ group2 = {"iops-total":50,"iops-total-max":60,"iops-total-max-length":10} variants: - group_change: - operation = group_change - variants: - - bps_non_4k: - group1 = {"bps-total":111111} - group2 = {"bps-total":222222} - - bps_iops: - group2 = {"iops-total":50} - - to_burst: - - to_empty: - group2 = {"iops-total":0} + operation = group_change + variants: + - bps_non_4k: + group1 = {"bps-total":111111} + group2 = {"bps-total":222222} + - bps_iops: + group2 = {"iops-total":50} + - to_burst: + - to_empty: + group2 = {"iops-total":0} - group_move: no ppc64 ppc64le operation = group_move throttle_group_member_group1 = "stg1" throttle_group_member_group2 = "stg2" variants: - - to_normal: - group2 = {"iops-total":50} - - to_burst: + - to_normal: + group2 = {"iops-total":50} + - to_burst: - with_reboot: - operation = operation_reboot + operation = operation_reboot - with_stop_resume: - operation = operation_stop_resume + operation = operation_stop_resume - with_hotplug: - operation = operation_hotplug - images += " stg1 stg2 stg3 stg4" - boot_drive_stg3 = no - boot_drive_stg4 = no - image_throttle_group_stg3 = "group1" - image_throttle_group_stg4 = "group2" - throttle_group_member_group1 = "stg1 stg2 stg3" - throttle_group_member_group2 = "stg4" - q35, arm64-pci: + operation = operation_hotplug + images += " stg1 stg2 stg3 stg4" + boot_drive_stg3 = no + boot_drive_stg4 = no + image_throttle_group_stg3 = "group1" + image_throttle_group_stg4 = "group2" + throttle_group_member_group1 = "stg1 stg2 stg3" + throttle_group_member_group2 = "stg4" + q35, arm64-pci: pcie_extra_root_port = 3 - negative: - throttle_groups = "group1" - operation = negative_test - variants: - - wrong_value: + throttle_groups = "group1" + operation = negative_test + variants: + - wrong_value: groups = "group2 group3 group4" group2 = {"iops-total":-1} err_msg_group2="values must be within" @@ -83,7 +83,7 @@ err_msg_group3 = "Invalid parameter type" group4 = {"iops-total":"@"} err_msg = "Invalid parameter type" - - wrong_option: + - wrong_option: groups = "group2 group3 group4 group5" group2 = {"iops-total":50,"iops-read":50} group3 = {"iops-total":50,"iops-write":50} @@ -91,27 +91,27 @@ group5 = {"bps-total":50,"bps-read":50} err_msg = "cannot be used at the same time" - with_snapshot: - throttle_groups = "group1" - operation = operation_snapshot - images = "image1 stg1" - storage_pools = default - storage_type_default = "directory" - storage_pool = default - base_tag = "stg1" - image_size_stg1 = 5000M - snapshot_tag = sn1 - image_size_sn1 = 5000M - image_name_sn1 = sn1 - image_format_sn1 = qcow2 - device = "drive_stg1" - overlay = "drive_sn1" - image_throttle_group_stg1 = "group1" - throttle_group_member_group1 = "stg1" - variants: - - normal: + throttle_groups = "group1" + operation = operation_snapshot + images = "image1 stg1" + storage_pools = default + storage_type_default = "directory" + storage_pool = default + base_tag = "stg1" + image_size_stg1 = 5000M + snapshot_tag = sn1 + image_size_sn1 = 5000M + image_name_sn1 = sn1 + image_format_sn1 = qcow2 + device = "drive_stg1" + overlay = "drive_sn1" + image_throttle_group_stg1 = "group1" + throttle_group_member_group1 = "stg1" + variants: + - normal: group1 = '{"iops-total":50}' repeat_test = 2 - - burst: + - burst: group1 = '{"iops-total":50,"iops-total-max":60,"iops-total-max-length":10}' throttle_group_parameters_group1 = ${group1} diff --git a/qemu/tests/cfg/throttle_parameter_test.cfg b/qemu/tests/cfg/throttle_parameter_test.cfg index 2c64c127f3..2ab17211e9 100644 --- a/qemu/tests/cfg/throttle_parameter_test.cfg +++ b/qemu/tests/cfg/throttle_parameter_test.cfg @@ -35,93 +35,93 @@ throttle_group_member_group1 = "stg1 stg2" throttle_group_member_group2 = "stg3 stg4" variants: - - normal_read: - variants: - - with_iops: - group1 = {"iops-read":40} - group2 = {"iops-read":50} - - with_bps: - group1 = {"bps-read":163840} - group2 = {"bps-read":204800} - - with_iops_bps: - group1 = {"bps-read":163840,"iops-read":40} - group2 = {"bps-read":204800,"iops-read":50} - - normal_write: - variants: - - with_iops: - group1 = {"iops-write":40} - group2 = {"iops-write":50} - - with_bps: - group1 = {"bps-write":163840} - group2 = {"bps-write":204800} - - with_iops_bps: - group1 = {"bps-write":163840,"iops-write":40} - group2 = {"bps-write":204800,"iops-write":50} - - normal_rw: - variants: - - with_iops: - group1 = {"iops-total":40} - group2 = {"iops-total":50} - - with_bps: - group1 = {"bps-total":163840} - group2 = {"bps-total":204800} - - with_iops_bps: - group1 = {"bps-total":163840,"iops-total":40} - group2 = {"bps-total":204800,"iops-total":50} - - with_iops_bps_rw: - group1 = {"bps-read":163840,"iops-read":20,"bps-write":163840,"iops-write":20} - group2 = {"bps-read":204800,"iops-read":25,"bps-write":204800,"iops-write":25} - ppc64,ppc64le: - throttle_runtime = 300 - - burst_read: - variants: - - with_iops: - group1 = {"iops-read":40,"iops-read-max":50,"iops-read-max-length":10} - group2 = {"iops-read":50,"iops-read-max":60,"iops-read-max-length":10} - - with_bps: - group1 = {"bps-read":163840,"bps-read-max":204800,"bps-read-max-length":10} - group2 = {"bps-read":204800,"bps-read-max":245760,"bps-read-max-length":10} - - with_iops_bps: - group1 = {"bps-read":163840,"iops-read":40,"iops-read-max":50,"iops-read-max-length":10,"bps-read-max":204800,"bps-read-max-length":10} - group2 = {"bps-read":204800,"iops-read":50,"iops-read-max":60,"iops-read-max-length":10,"bps-read-max":245760,"bps-read-max-length":10} - - burst_write: - variants: - - with_iops: - group1 = {"iops-write":40,"iops-write-max":50,"iops-write-max-length":10} - group2 = {"iops-write":50,"iops-write-max":60,"iops-write-max-length":10} - - with_bps: - group1 = {"bps-write":163840,"bps-write-max":204800,"bps-write-max-length":10} - group2 = {"bps-write":204800,"bps-write-max":245760,"bps-write-max-length":10} - - with_iops_bps: - group1 = {"bps-write":163840,"iops-write":40,"iops-write-max":50,"iops-write-max-length":10,"bps-write-max":204800,"bps-write-max-length":10} - group2 = {"bps-write":204800,"iops-write":50,"iops-write-max":60,"iops-write-max-length":10,"bps-write-max":245760,"bps-write-max-length":10} - - burst_rw: - variants: - - with_iops: - group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":10} - group2 = {"iops-total":50,"iops-total-max":60,"iops-total-max-length":10} - - with_bps: - group1 = {"bps-total":163840,"bps-total-max":204800,"bps-total-max-length":10} - group2 = {"bps-total":204800,"bps-total-max":245760,"bps-total-max-length":10} - ppc64,ppc64le: - group1 = {"bps-total":163840,"bps-total-max":204800,"bps-total-max-length":30} - group2 = {"bps-total":204800,"bps-total-max":245760,"bps-total-max-length":30} - - with_iops_bps: - group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"bps-total-max":204800,"bps-total-max-length":10} - group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":10,"bps-total-max":245760,"bps-total-max-length":10} - ppc64,ppc64le: - group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":30,"bps-total-max":204800,"bps-total-max-length":30} - group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":30,"bps-total-max":245760,"bps-total-max-length":30} - - mix: - throttle_groups = "group1" - images = "image1 stg1 stg2" - variants: - - with_iops_size: - group1 = {"iops-total":60,"iops-size":8192} - - with_iops_size_burst: - group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"iops-size":8192} - - with_iops_bps_all: - group1 = {"iops-read":20,"iops-read-max":30,"iops-read-max-length":20,"iops-write":20,"iops-write-max":30,"iops-write-max-length":20,"bps-read":163840,"bps-read-max":204800,"bps-read-max-length":20,"bps-write":163840,"bps-write-max":204800,"bps-write-max-length":20} + - normal_read: + variants: + - with_iops: + group1 = {"iops-read":40} + group2 = {"iops-read":50} + - with_bps: + group1 = {"bps-read":163840} + group2 = {"bps-read":204800} + - with_iops_bps: + group1 = {"bps-read":163840,"iops-read":40} + group2 = {"bps-read":204800,"iops-read":50} + - normal_write: + variants: + - with_iops: + group1 = {"iops-write":40} + group2 = {"iops-write":50} + - with_bps: + group1 = {"bps-write":163840} + group2 = {"bps-write":204800} + - with_iops_bps: + group1 = {"bps-write":163840,"iops-write":40} + group2 = {"bps-write":204800,"iops-write":50} + - normal_rw: + variants: + - with_iops: + group1 = {"iops-total":40} + group2 = {"iops-total":50} + - with_bps: + group1 = {"bps-total":163840} + group2 = {"bps-total":204800} + - with_iops_bps: + group1 = {"bps-total":163840,"iops-total":40} + group2 = {"bps-total":204800,"iops-total":50} + - with_iops_bps_rw: + group1 = {"bps-read":163840,"iops-read":20,"bps-write":163840,"iops-write":20} + group2 = {"bps-read":204800,"iops-read":25,"bps-write":204800,"iops-write":25} + ppc64,ppc64le: + throttle_runtime = 300 + - burst_read: + variants: + - with_iops: + group1 = {"iops-read":40,"iops-read-max":50,"iops-read-max-length":10} + group2 = {"iops-read":50,"iops-read-max":60,"iops-read-max-length":10} + - with_bps: + group1 = {"bps-read":163840,"bps-read-max":204800,"bps-read-max-length":10} + group2 = {"bps-read":204800,"bps-read-max":245760,"bps-read-max-length":10} + - with_iops_bps: + group1 = {"bps-read":163840,"iops-read":40,"iops-read-max":50,"iops-read-max-length":10,"bps-read-max":204800,"bps-read-max-length":10} + group2 = {"bps-read":204800,"iops-read":50,"iops-read-max":60,"iops-read-max-length":10,"bps-read-max":245760,"bps-read-max-length":10} + - burst_write: + variants: + - with_iops: + group1 = {"iops-write":40,"iops-write-max":50,"iops-write-max-length":10} + group2 = {"iops-write":50,"iops-write-max":60,"iops-write-max-length":10} + - with_bps: + group1 = {"bps-write":163840,"bps-write-max":204800,"bps-write-max-length":10} + group2 = {"bps-write":204800,"bps-write-max":245760,"bps-write-max-length":10} + - with_iops_bps: + group1 = {"bps-write":163840,"iops-write":40,"iops-write-max":50,"iops-write-max-length":10,"bps-write-max":204800,"bps-write-max-length":10} + group2 = {"bps-write":204800,"iops-write":50,"iops-write-max":60,"iops-write-max-length":10,"bps-write-max":245760,"bps-write-max-length":10} + - burst_rw: + variants: + - with_iops: + group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":10} + group2 = {"iops-total":50,"iops-total-max":60,"iops-total-max-length":10} + - with_bps: + group1 = {"bps-total":163840,"bps-total-max":204800,"bps-total-max-length":10} + group2 = {"bps-total":204800,"bps-total-max":245760,"bps-total-max-length":10} + ppc64,ppc64le: + group1 = {"bps-total":163840,"bps-total-max":204800,"bps-total-max-length":30} + group2 = {"bps-total":204800,"bps-total-max":245760,"bps-total-max-length":30} + - with_iops_bps: + group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"bps-total-max":204800,"bps-total-max-length":10} + group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":10,"bps-total-max":245760,"bps-total-max-length":10} + ppc64,ppc64le: + group1 = {"bps-total":163840,"iops-total":40,"iops-total-max":50,"iops-total-max-length":30,"bps-total-max":204800,"bps-total-max-length":30} + group2 = {"bps-total":204800,"iops-total":50,"iops-total-max":60,"iops-total-max-length":30,"bps-total-max":245760,"bps-total-max-length":30} + - mix: + throttle_groups = "group1" + images = "image1 stg1 stg2" + variants: + - with_iops_size: + group1 = {"iops-total":60,"iops-size":8192} + - with_iops_size_burst: + group1 = {"iops-total":40,"iops-total-max":50,"iops-total-max-length":10,"iops-size":8192} + - with_iops_bps_all: + group1 = {"iops-read":20,"iops-read-max":30,"iops-read-max-length":20,"iops-write":20,"iops-write-max":30,"iops-write-max-length":20,"bps-read":163840,"bps-read-max":204800,"bps-read-max-length":20,"bps-write":163840,"bps-write-max":204800,"bps-write-max-length":20} throttle_group_parameters_group1 = ${group1} throttle_group_parameters_group2 = ${group2} diff --git a/qemu/tests/cfg/timedrift_no_net.cfg b/qemu/tests/cfg/timedrift_no_net.cfg index d8966bea7f..8557bd81c7 100644 --- a/qemu/tests/cfg/timedrift_no_net.cfg +++ b/qemu/tests/cfg/timedrift_no_net.cfg @@ -23,8 +23,7 @@ date_time_command = "echo TIME: %date% %time%" date_time_filter_re = "(?:TIME: \w\w\w )(.{19})(?:.+)" date_time_format = "%m/%d/%Y %H:%M:%S" - nettype = user # It is enough to avoid ntpdate or similar update - # guest time + nettype = user # It is enough to avoid ntpdate or similar update guest time services_up_timeout = 0 kill_vm_gracefully = no @@ -33,7 +32,6 @@ time_diff_tolerance = 1.0 wait_timeout = 60 - variants clock_source: - clock_vm: Linux: diff --git a/qemu/tests/cfg/trim_support_test.cfg b/qemu/tests/cfg/trim_support_test.cfg index 94a13af695..949eeac1e5 100644 --- a/qemu/tests/cfg/trim_support_test.cfg +++ b/qemu/tests/cfg/trim_support_test.cfg @@ -34,28 +34,28 @@ Win2016, Win2019, Win8..1, Win2012..r2: driver_verifier += " ndis" variants: - - @default: - - with_4k_disk: - only virtio_blk - block_size = 4K - physical_block_size_stg1 = 4096 - logical_block_size_stg1 = 4096 - guest_trim_cmd = 'powershell "Optimize-Volume -DriveLetter %s -ReTrim -Verbose"' - event_id = 55 - searched_keywords = "A corruption was discovered in the file system structure on volume" - filter_options = "" - query_cmd = 'wevtutil qe system /q:"%s" /f:text' - - with_discard_granularity: - retrim_size_check = no - guest_trim_cmd = "defrag.exe %s: /u /v /h /o" - variants: - - 4K: - blk_extra_params_stg1 = "discard_granularity=4096" - defrag_timeout = 630 - - 256K: - blk_extra_params_stg1 = "discard_granularity=262144" - defrag_timeout = 20 - - 32M: - blk_extra_params_stg1 = "discard_granularity=33554432" - defrag_timeout = 10 + - @default: + - with_4k_disk: + only virtio_blk + block_size = 4K + physical_block_size_stg1 = 4096 + logical_block_size_stg1 = 4096 + guest_trim_cmd = 'powershell "Optimize-Volume -DriveLetter %s -ReTrim -Verbose"' + event_id = 55 + searched_keywords = "A corruption was discovered in the file system structure on volume" + filter_options = "" + query_cmd = 'wevtutil qe system /q:"%s" /f:text' + - with_discard_granularity: + retrim_size_check = no + guest_trim_cmd = "defrag.exe %s: /u /v /h /o" + variants: + - 4K: + blk_extra_params_stg1 = "discard_granularity=4096" + defrag_timeout = 630 + - 256K: + blk_extra_params_stg1 = "discard_granularity=262144" + defrag_timeout = 20 + - 32M: + blk_extra_params_stg1 = "discard_granularity=33554432" + defrag_timeout = 10 diff --git a/qemu/tests/cfg/usb_device_check.cfg b/qemu/tests/cfg/usb_device_check.cfg index cfd4d7050e..2e8e6672c7 100644 --- a/qemu/tests/cfg/usb_device_check.cfg +++ b/qemu/tests/cfg/usb_device_check.cfg @@ -17,7 +17,7 @@ usb_kbd_for_qemu = "QEMU USB Keyboard" usb_tablet_for_qemu = "QEMU USB Tablet" # usb device info for Linux guest - usb_hub_for_guest = "QEMU USB Hub" + usb_hub_for_guest = "QEMU USB Hub" usb_mouse_for_guest = "QEMU USB Mouse" usb_kbd_for_guest = "QEMU USB Keyboard" usb_tablet_for_guest = "QEMU USB Tablet" @@ -33,7 +33,6 @@ usb_kbd_for_guest = "VID_0627&PID_0001" usb_tablet_for_guest = "VID_0627&PID_0001" - # usb controllers variants: - piix3-uhci: diff --git a/qemu/tests/cfg/win_irq_check.cfg b/qemu/tests/cfg/win_irq_check.cfg index ae3a9f19d7..a221a4d9fb 100644 --- a/qemu/tests/cfg/win_irq_check.cfg +++ b/qemu/tests/cfg/win_irq_check.cfg @@ -43,4 +43,4 @@ queues = 4 - msi_disable_by_vectors: no with_vioscsi - vectors = 0 + vectors = 0 diff --git a/qemu/tests/cfg/win_virtio_update.cfg b/qemu/tests/cfg/win_virtio_update.cfg index 50c4e2c085..60ce131c6e 100644 --- a/qemu/tests/cfg/win_virtio_update.cfg +++ b/qemu/tests/cfg/win_virtio_update.cfg @@ -23,41 +23,41 @@ kill_rundll = no variants: - install_driver: - case_type = driver_install - check_str_balloon = Virtio Balloon - check_str_block = Virtio SCSI DISK - check_str_nic = VirtIO Ethernet Adapter - check_cmd = wmic sysdriver get caption - check_cmd_block = wmic diskdrive get caption - check_cmd_nic = wmic nic get caption - # There are serverial parameters for set up the default driver - # format for devices, like block, nic and display. They are used - # to make sure the guest can boot up normally when there is no - # virtio driver in guests. Please set up them basiced on your - # test environment. - # default_drive_format: for block devices - # default_nic_model: for nic devices - # default_display: for display devices - q35: - default_drive_format = ahci + case_type = driver_install + check_str_balloon = Virtio Balloon + check_str_block = Virtio SCSI DISK + check_str_nic = VirtIO Ethernet Adapter + check_cmd = wmic sysdriver get caption + check_cmd_block = wmic diskdrive get caption + check_cmd_nic = wmic nic get caption + # There are serverial parameters for set up the default driver + # format for devices, like block, nic and display. They are used + # to make sure the guest can boot up normally when there is no + # virtio driver in guests. Please set up them basiced on your + # test environment. + # default_drive_format: for block devices + # default_nic_model: for nic devices + # default_display: for display devices + q35: + default_drive_format = ahci - upgrade_downgrade: - # This test force on test some sepical version of virtio_drivers so if your virtio dirver is not the standard - # version get from fedora server, please use following parameters to make your own dirver iso - # prewhql_install = yes - # cdrom_virtio = /tmp/virtio-win.iso - # url_virtio_win = - check_str_balloon = Virtio Balloon - check_str_block = Virtio SCSI DISK - check_str_nic = VirtIO Ethernet Adapter - check_cmd = wmic sysdriver get caption - check_cmd_block = wmic diskdrive get caption - check_cmd_nic = wmic nic get caption + # This test force on test some sepical version of virtio_drivers so if your virtio dirver is not the standard + # version get from fedora server, please use following parameters to make your own dirver iso + # prewhql_install = yes + # cdrom_virtio = /tmp/virtio-win.iso + # url_virtio_win = + check_str_balloon = Virtio Balloon + check_str_block = Virtio SCSI DISK + check_str_nic = VirtIO Ethernet Adapter + check_cmd = wmic sysdriver get caption + check_cmd_block = wmic diskdrive get caption + check_cmd_nic = wmic nic get caption - variants: - - block: - drivers_install = block - op_cmd = cmd /c E:\\whql\virtio_driver_check_whql.exe F:\\WXp\\x86 block - driver_install_cmd_block = cmd /c E:\\whql\virtio_driver_install_whql.exe F:\\WXp\\x86 block + variants: + - block: + drivers_install = block + op_cmd = cmd /c E:\\whql\virtio_driver_check_whql.exe F:\\WXp\\x86 block + driver_install_cmd_block = cmd /c E:\\whql\virtio_driver_install_whql.exe F:\\WXp\\x86 block - check_info: type = win_virtio_update drivers_install = "balloon;block;nic;serial" @@ -79,4 +79,3 @@ sys_file_path_serial = "c:\\\\windows\\\\system32\\\\drivers\\\\vioser.sys" python_scripts = "del C:\pecheck.py && echo import pefile, re, sys > C:\pecheck.py && echo filename = sys.argv[1] >> C:\pecheck.py && echo pattern_c = sys.argv[2] >> C:\pecheck.py && echo pe = pefile.PE(filename) >> C:\pecheck.py && echo peinfo = pe.dump_info() >> C:\pecheck.py && echo print(re.findall(pattern_c, peinfo)[0].strip()) >> C:\pecheck.py" pattern_driver = WIN_VIRTIO:(.*)[/s+"] -