Merge remote branch 'autotest-upstream/master' into autotest-merge

client/tests/kvm/tests_base.cfg.sample

 # Copy this file to tests_base.cfg and edit it.
 #
 # Define the objects we'll be using
 vms = vm1
 images = image1
 cdroms = cd1
 nics = nic1
 monitors = humanmonitor1
 
 # Choose the main VM and monitor
@@ skipping 22 matching lines @@
 qemu_img_binary = qemu-img
 smp = 1
 mem = 512
 image_size = 10G
 drive_index_image1 = 0
 drive_cache = none
 shell_port = 22
 display = vnc
 drive_index_cd1 = 1
 
+qxl = on
+qxl_dev_nr = 1
+spice = disable-ticketing
+
 # Monitor params
 monitor_type = human
 
 # Default scheduler params
 used_cpus = 1
 used_mem = 512
 
 # Port redirections
 redirs = remote_shell
 guest_port_remote_shell = 22
@@ skipping 33 matching lines @@
 
     - setup:        install
         type = steps
         fail_if_stuck_for = 300
         stuck_detection_history = 2
         kill_vm_on_error = yes
         keep_screendump_history = yes
 
     - unattended_install:
         type = unattended_install
+        start_vm = no
         kill_vm = yes
         kill_vm_gracefully = yes
         kill_vm_on_error = yes
         force_create_image = yes
         extra_params += " -boot d"
         guest_port_unattended_install = 12323
         kernel = vmlinuz
         initrd = initrd.img
         nic_mode = tap
         # uncomment the following line to test the migration in parallel
         # migrate_background = yes
 
         variants:
             # Install guest from cdrom 
             - cdrom:
                 medium = cdrom
                 nic_mode = user
                 redirs += " unattended_install"
             # Install guest from http/ftp url
             - url:
+                only Linux
                 medium = url
                 url = REPLACE_THIS_WITH_TREE_URL
             # Install guest from nfs nfs_server:nfs_dir
             - nfs:
+                only Linux
                 medium = nfs
                 nfs_server = REPLACE_THIS_WITH_NFS_SERVER
                 nfs_dir = REPLACE_THIS_WITH_NFS_DIRECTORY
             # Install guest with a remote kickstart
             - remote_ks:
+                only Linux
                 medium = url
                 extra_params = " --append ks=REPLACE_THIS_WITH_URL_OF_KS"
                 url = REPLACE_THIS_WITH_TREE_URL
 
     - boot:         install setup unattended_install.cdrom
         type = boot
         restart_vm = yes
         kill_vm_on_error = yes
         login_timeout = 240
 
@@ skipping 28 matching lines @@
                 mig_cancel = yes
         variants:
             - @default:
             - with_reboot:
                 iterations = 1
                 type = migration_with_reboot
             - with_file_transfer:
                 iterations = 1
                 type = migration_with_file_transfer
             - with_autotest:
+                only Linux
                 type = autotest
                 migrate_background = yes
                 test_timeout = 1800
                 variants:
                     - dbench:
                         test_control_file = dbench.control
                     - stress:
                         test_control_file = stress.control
                     - monotonic_time:
                         test_control_file = monotonic_time.control
@@ skipping 14 matching lines @@
     - boot_savevm: install setup unattended_install.cdrom
         type = boot_savevm
         savevm_delay = 0.3
         savevm_login_delay = 120
         savevm_timeout = 2000
         kill_vm_on_error = yes
         kill_vm_gracefully = yes
         kill_vm = yes
 
     - autotest:     install setup unattended_install.cdrom
+        only Linux
         type = autotest
         test_timeout = 1800
         variants:
             - sleeptest:
                 test_timeout = 120
                 test_control_file = sleeptest.control
             - dbench:
                 test_control_file = dbench.control
             - bonnie:
                 test_control_file = bonnie.control
@@ skipping 19 matching lines @@
             - tsc:
                 test_control_file = tsc.control
             - scrashme:
                 test_control_file = scrashme.control
             - hwclock:
                 test_control_file = hwclock.control
             - rtc:
                 test_control_file = rtc.control
             - iozone:
                 test_control_file = iozone.control
-
+            - flail:
+                test_control_file = flail.control
+            - systemtap:
+                test_control_file = systemtap.control
 
     - linux_s3:     install setup unattended_install.cdrom
+        only Linux
         type = linux_s3
 
     - timedrift:    install setup unattended_install.cdrom
         variants:
             - ntp:
                 variants:
                     - with_load:
                         type = timedrift
                         # Pin the VM and host load to CPU #0
                         cpu_mask = 0x1
@@ skipping 63 matching lines @@
         alive_test_cmd = uname -a
         login_timeout = 240
         kill_vm = yes
         kill_vm_vm1 = no
         kill_vm_gracefully = no
         extra_params += " -snapshot"
         used_cpus = 5
         used_mem = 2560
 
     - guest_test:       install setup unattended_install.cdrom
+        only Windows
         type = guest_test
         login_timeout = 360
         test_timeout = 600
         script_params =
         reboot = yes
         variants:
             - autoit:
                 interpreter = "cmd /c D:\AutoIt3.exe"
                 variants:
                     - notepad:
                         guest_script = autoit/notepad1.au3
                         dst_rsc_path = "C:\script.au3"
                     - stub:
                         download = yes
                         download_cmd = "git clone"
                         rsc_server = "git://the.resource.server/autoit"
                         dst_rsc_dir = "C:\"
                         dst_rsc_path = "C:\autoit\stub\stub.au3"
             - powershell:
                 interpreter = "cmd /c powershell.exe -File"
                 variants:
                     - stub:
                         download = yes
                         download_cmd = "git clone"
                         rsc_server = "git://the.resource.server/powershell"
                         dst_rsc_dir = "C:\"
                         dst_rsc_path = "C:\powershell\stub\stub.ps1"
 
     - iozone_windows: unattended_install.cdrom
+        only Windows
         type = iozone_windows
         iozone_cmd = "D:\IOzone\iozone.exe -a"
         iozone_timeout = 3600
 
     - whql:         install setup unattended_install.cdrom
+        only Windows
         nic_mode = tap
         # Replace this with the address of an installed DTM server
         server_address = 10.20.30.40
         # The server should run rss.exe like a regular Windows VM, preferably
         # with administrator privileges (or at least with permission to write
         # to the DTM studio directory)
         server_shell_port = 10022
         server_file_transfer_port = 10023
         server_studio_path = %programfiles%\Microsoft Driver Test Manager\Studio
         dsso_test_binary = deps/whql_submission_15.exe
@@ skipping 211 matching lines @@
                 pci_model = scsi
                 match_string = "LSI Logic"
         variants:
             - fmt_qcow2:
                 image_format_stg = qcow2
             - fmt_raw:
                 image_format_stg = raw
 
     - enospc:
         type = enospc
+        start_vm = no
         images += " stg"
         drive_werror = stop
         drive_cache = none
         image_name_stg = enospc
         image_format_stg = qcow2
         image_boot_stg = no
         image_snapshot_stg = no
         check_image_stg = no
         vgtest_name = vg_kvm_test_enospc
         lvtest_name = lv_kvm_test_enospc
         background_cmd = "nohup dd if=/dev/zero of=%s bs=1024 &"
         kill_vm = yes
 
     - qmp_basic: install setup unattended_install.cdrom
         type = qmp_basic
 
     - qmp_basic_rhel6: install setup unattended_install.cdrom
         type = qmp_basic_rhel6
 
     - vlan:  install setup unattended_install.cdrom
+        only Linux
         type = vlan
         # subnet should not be used by host
         subnet = "192.168"
         vlan_num = 5
         file_size = 10
         maximal = 4094
         listen_cmd = "nc -l %s > %s"
         send_cmd = "nc %s %s < %s"
         nic_mode = tap
         vms += " vm2"
         image_snapshot = yes
         kill_vm_vm2 = yes
         kill_vm_gracefully_vm2 = no
 
     - ping: install setup unattended_install.cdrom
         type = ping
         counts = 100
         flood_minutes = 10
         nics += ' nic2'
 
     - jumbo: install setup unattended_install.cdrom
+        only Linux
         type = jumbo
 
     - file_transfer: install setup unattended_install.cdrom
         type = file_transfer
         filesize = 4000
         transfer_timeout = 1000
         variants:
             - remote:
                 transfer_type = remote
 
     - nicdriver_unload:  install setup unattended_install.cdrom
+        only Linux
         type = nicdriver_unload
         nic_mode = tap
         filesize = 100
         transfer_timeout = 100
         transfer_type = remote
         sessions_num = 10
 
     - nic_promisc:  install setup unattended_install.cdrom
+        only Linux
         type = nic_promisc
         filesize = 400
         transfer_timeout = 100
         transfer_type = remote
 
     - multicast: install setup unattended_install.cdrom
+        only Linux
         type = multicast
         nic_mode = tap
         mcast = 225.0.0.1
         mgroup_count = 20
         flood_minutes = 1
 
     - pxe:
         type = pxe
         images = pxe
         image_name_pxe = pxe-test
         image_size_pxe = 1G
         force_create_image_pxe = yes
         remove_image_pxe = yes
         extra_params += ' -boot n'
         kill_vm_on_error = yes
         network = bridge
         restart_vm = yes
         pxe_timeout = 60
 
     - mac_change: install setup unattended_install.cdrom
+        only Linux
         type = mac_change
         kill_vm = yes
 
     - netperf: install setup unattended_install.cdrom
+        only Linux
         type = netperf
+        nics += ' nic2 nic3 nic4'
         nic_mode = tap
         netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch
         packet_size = 1500
         setup_cmd = "cd %s && tar xvfj netperf-2.4.5.tar.bz2 && cd netperf-2.4.5 && patch -p0 < ../wait_before_data.patch && ./configure && make"
         netserver_cmd =  %s/netperf-2.4.5/src/netserver
         variants:
             - stream:
                 netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -m %s
                 protocols = "TCP_STREAM TCP_MAERTS TCP_SENDFILE UDP_STREAM"
             - rr:
                 netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -r %s
                 protocols = "TCP_RR TCP_CRR UDP_RR"
 
     - ethtool: install setup unattended_install.cdrom
+        only Linux
         type = ethtool
         filesize = 512
         nic_mode = tap
 
     - nic_bonding:
+        only Linux
         type = nic_bonding
         nics += ' nic2 nic3 nic4'
         image_snapshot = yes
         serial_login = yes
         test_timeout = 1000
         filesize = 4000
         transfer_timeout = 1000
         transfer_type = remote
         kill_vm = yes
         # you can specify the parameters of bonding module here
         # bonding_params = "mode=active-backup"
 
     - set_link:
         type = set_link
         test_timeout = 1000
         filesize = 4000
         transfer_timeout = 1000
         transfer_type = remote
         kill_vm =yes
 
     - physical_resources_check: install setup unattended_install.cdrom
         type = physical_resources_check
         catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'
 
-    - ksm_overcommit:
+    - ksm_overcommit: install setup unattended_install.cdrom
+        only Linux
         # Don't preprocess any vms as we need to change its params
         vms = ''
         image_snapshot = yes
         kill_vm_gracefully = no
         type = ksm_overcommit
         # Make host use swap (a value of 'no' will turn off host swap)
         ksm_swap = yes
         no hugepages
         # Overcommit of host memmory
         ksm_overcommit_ratio = 3
         # Max paralel runs machine
         ksm_parallel_ratio = 4
         # Host memory reserve (default - best fit for used mem)
         # ksm_host_reserve = 512
         # ksm_guest_reserve = 1024
         variants:
             - ksm_serial:
                 ksm_mode = "serial"
             - ksm_parallel:
                 ksm_mode = "parallel"
 
     - iofuzz:
+        only Linux
         type = iofuzz
 
     - virtio_console:
+        only Linux
         vms = ''
         type = virtio_console
+        # Default number of consoles
+        virtio_console_no_serialports = 0
+        virtio_console_no_consoles = 0
+
         # smoke params - $console_type:data_string
         # FIXME: test_smoke doesn't work with console yet (virtio_console bug)
         # "serialport;console:Custom data"
+        smoke_test = yes
         virtio_console_smoke = "serialport"
         # loopback params - '$source_console_type@buffer_length:$destination_console_type1@buffer_length:...:$loopback_buffer_length;...'
+        loopback_test = yes
         virtio_console_loopback = "serialport:serialport;serialport@1024:serialport@32:console@1024:console@8:16"
         # perf params - $console_type@buffer_length:$test_duration
         # FIXME: test_perf doesn't work with console yet (virtio_console bug)
         # virtio_console_perf = "serialport;serialport@1000000:120;console@1024:60"
+        perf_test = yes
         virtio_console_perf = "serialport;serialport@1000000:120"
+        # Enable destructive tests: "test_name  = yes"
+        # Disable test: change yes or delete key.
+        rmmod_test = yes
+        max_ports_test = yes
+        shutdown_test = yes
+
+        # Offline migration params - '$console_type:$no_migrations:$send-:$recv-$loopback-buffer_length'
+        migrate_offline_test = yes
+        virtio_console_migration_offline = "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096"
+
+        # Online migration params - '$console_type:$no_migrations:$send-:$recv-$loopback-buffer_length'
+        migrate_online_test = yes
+        virtio_console_migration_online = "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096"
+
+        hotplug_test = yes
+        hotplug_serial_test = yes
+        hotplug_console_test = no
 
     # This unit test module is for older branches of KVM that use the
     # kvmctl test harness (such as the code shipped with RHEL 5.x)
     - unit_test_kvmctl:
         type = unit_test
         vms = ''
         profilers = ''
         variants:
             - access:
                 case = access
@@ skipping 23 matching lines @@
     - module_probe:
         type = module_probe
         # You can specify your own module list, though it is not needed usually.
         # mod_list = kvm
         load_count = 100
         vms = ''
         profilers = ''
         take_regular_screendumps = no
 
     - ioquit:
+        only Linux
         type = ioquit
         background_cmd = "for i in 1 2 3 4; do (dd if=/dev/urandom of=/tmp/file bs=102400 count=10000000 &); done"
         check_cmd = ps -a |grep dd
         login_timeout = 360
 
     - qemu_img:
         type = qemu_img
         vms = ''
         profilers = ''
         take_regular_screendumps = no
@@ skipping 28 matching lines @@
                 subcommand = commit
             - info:
                 subcommand = info
             - rebase:
                 subcommand = rebase
                 rebase_mode = unsafe
                 image_name_snapshot1 = sn1
                 image_name_snapshot2 = sn2
 
     - clock_getres: install setup unattended_install.cdrom
+        only Linux
         type = clock_getres
 
     - yum_update:    install setup unattended_install.cdrom
+        only Fedora, RHEL
         type = yum_update
         shell_prompt = "Is this ok"
 
     - kdump: unattended_install.cdrom
+        only Linux
         type = kdump
         # time waited for the completion of crash dump
         # crash_timeout = 360
         # command to add the crashkernel=X@Y to kernel cmd line
         # kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=128M@64M"
         # command to enable kdump service
         # kdump_enable_cmd = chkconfig kdump on && service kdump start
         # command to probe the crash kernel
         # crash_kernel_prob_cmd = "grep -q 1 /sys/kernel/kexec_crash_loaded"
 
@@ skipping 61 matching lines @@
             dp_regex_clientmsgdev = VirtIO Ethernet Adapter #2$
             dp_regex_clientsupportdev = VirtIO Ethernet Adapter #3$
             # Device selection for the NDISTest server machine
             dp_regex_servermsgdev = VirtIO Ethernet Adapter$
             dp_regex_serversupportdev = VirtIO Ethernet Adapter #2$
 
 # Guests
 variants:
     # Linux section
     - @Linux:
-        no autoit iozone_windows whql
         shutdown_command = shutdown -h now
         reboot_command = shutdown -r now
         status_test_command = echo $?
         username = root
         password = 123456
         shell_client = ssh
         shell_port = 22
         file_transfer_client = scp
         file_transfer_port = 22
         mem_chk_cmd = dmidecode -t 17 | awk -F: '/Size/ {print $2}'
@@ skipping 19 matching lines @@
                 time_command = "ntpdate -d -q ns1.nay.redhat.com"
                 time_filter_re = "originate timestamp:.*, (.\w+\s+\d+\s+\d+\s+\d+:\d+:\d+)\.(.\d+)"
                 time_format = "%b %d %Y %H:%M:%S"
             date:
                 time_command = date +'TIME: %a %m/%d/%Y %H:%M:%S.%N'
                 time_filter_re = "(?:TIME: \w\w\w )(.{19})(?:\.\d\d)"
                 time_format = "%m/%d/%Y %H:%M:%S"
         file_transfer:
             tmp_dir = /tmp/
             clean_cmd = rm -f
+        nicdriver_unload:
+            readlink_command = readlink -e
+            sys_path = "/sys/class/net/%s/device/driver"
 
         variants:
             - Fedora:
                 no setup
                 shell_prompt = "^\[.*\][\#\$]\s*$"
                 unattended_install:
                     boot_path = "images/pxeboot"
                     # You have to use ks=floppy if you want to use floppies to
                     # hold your kickstart file
                     #extra_params += " --append 'ks=floppy nicdelay=60 console=ttyS0,115200 console=tty0'"
@@ skipping 473 matching lines @@
                         setup:
                             steps = Ubuntu-8.10-server-32-gcc.steps
 
             - RHEL:
                 no setup
                 shell_prompt = "^\[.*\][\#\$]\s*$"
                 nic_hotplug:
                     modprobe_module = acpiphp
                 block_hotplug:
                     modprobe_module = acpiphp
+                    no block_scsi
                 unattended_install:
                     boot_path = images/pxeboot
                     # You have to use ks=floppy if you want to use floppies to
                     # hold your kickstart file
                     #extra_params += " --append 'ks=floppy nicdelay=60 console=ttyS0,115200 console=tty0'"
                     extra_params += " --append 'ks=cdrom nicdelay=60 console=ttyS0,115200 console=tty0'"
 
                 variants:
                     - 3.9.i386:
                         no setup autotest linux_s3 guest_s4 shutdown
@@ skipping 80 matching lines @@
                         unattended_install:
                             unattended_file = unattended/RHEL-4-series.ks
                             #floppy = images/rhel48-32/ks.vfd
                             cdrom_unattended = images/rhel48-32/ks.iso
                             kernel = images/rhel48-32/vmlinuz
                             initrd = images/rhel48-32/initrd.img
                         unattended_install.cdrom:
                             cdrom_cd1 = isos/linux/RHEL-4.8-i386-DVD.iso
                             md5sum_cd1 = b024f0af5079539d3ef51f71fed0b194
                             md5sum_1m_cd1 = 969c197402b9058f28a278c1f807d15b
+                        nicdriver_unload:
+                            readlink_command = readlink -f
+                            sys_path = "/sys/class/net/%s/driver"
 
 
                     - 4.8.x86_64:
                         no setup autotest
                         image_name = rhel4-64
                         unattended_install:
                             unattended_file = unattended/RHEL-4-series.ks
                             #floppy = images/rhel48-64/ks.vfd
                             cdrom_unattended = images/rhel48-64/ks.iso
                             kernel = images/rhel48-64/vmlinuz
                             initrd = images/rhel48-64/initrd.img
                         unattended_install.cdrom:
                             cdrom_cd1 = isos/linux/RHEL-4.8-x86_64-DVD.iso
                             md5sum_cd1 = 696bc877b0200cc942626673fcc3fc09
                             md5sum_1m_cd1 = b11ac0ef7fd345ad712966972db63886
+                        nicdriver_unload:
+                            readlink_command = readlink -f
+                            sys_path = "/sys/class/net/%s/driver"
 
 
                     - 5.3.i386:
                         no setup
                         image_name = rhel5-32
                         install:
                             steps = RHEL-5.3-i386.steps
                             cdrom_cd1 = isos/linux/RHEL-5.3-i386-DVD.iso
                             md5sum_cd1 = 371c62851611fd32ead440df6f24a296
                             md5sum_1m_cd1 = 242318dd44152210f6ff6cdda1bfbf51
@@ skipping 123 matching lines @@
                             initrd = images/rhel60-64/initrd.img
                         unattended_install.cdrom:
                             cdrom_cd1 = isos/linux/RHEL-6.0-x86_64-DVD.iso
                             md5sum_cd1 = f7141396c6a19399d63e8c195354317d
                             md5sum_1m_cd1 = b060eeef63e2c8700db54ae02056e80c
 
 
 
     # Windows section
     - @Windows:
-        no autotest, linux_s3, vlan, ioquit, unattended_install.url, unattended_install.nfs, unattended_install.remote_ks
-        no jumbo, nicdriver_unload, nic_promisc, multicast, mac_change, ethtool, clock_getres
-
         shutdown_command = shutdown /s /f /t 0
         reboot_command = shutdown /r /f /t 0
         status_test_command = echo %errorlevel%
         shell_prompt = "^\w:\\.*>\s*$"
         username = Administrator
         password = 123456
         shell_linesep = "\r\n"
         shell_client = nc
         shell_port = 10022
         file_transfer_client = rss
@@ skipping 655 matching lines @@
         driver = igb
         # Driver option to specify the maximum number of virtual functions
         # (on vxge the option is , for example, is max_config_dev)
         # the default below is for the igb driver
         driver_option = "max_vfs=7"
         # Number of devices that are going to be requested.
         devices_requested = 7
 
 
 steps ?<= steps/