qemu.cfg: Delete host-kernel.cfg and seprate the config to host-kernel folder...

qemu.cfg: Delete host-kernel.cfg and seprate the config to host-kernel folder and host-kernel-base.cfg.

Also add host-kernel-check.cfg to host-kernel folder. It only contains the config used
to filder host version. This file only used in control.kernel-version.

host-kernel.cfg will be auto created according to host-kernel-base.cfg and  host-kernel folder.

Whenever you add a new host type to host-kernel folder, please also add it to
 host-kernel-check.cfg. Or script could not filter out this host type.

Add rhel.6.4 and rhel.6.5 host config.
Signed-off-by: NFeng Yang <fyang@redhat.com>

qemu/cfg/host-kernel-base.cfg

+# Host kernel related parameters
+# Here will set up a set up parameters for the test based on the different
+# kernel installed in RHEL system. You can also edit this to match other
+# packages in the host under test.
+
+package_check_cmd_kernel = uname -r
+package_version_pattern_kernel = [\.\-\_\w\d]+
+# Whether we will print out debug informations during the host check
+# The default value is no.
+# host_check_verbose = yes
+

qemu/cfg/host-kernel.cfg

-# Host kernel related parameters
-# Here will set up a set up parameters for the test based on the different
-# kernel installed in RHEL system. You can also edit this to match other
-# packages in the host under test.
-# The parameters for package check for Fedora and REL are, take qemu-kvm
-# as an example:
-# required_packages = "qemu-kvm seabios-bin"
-# package_check_cmd = "rpm -q PACKNAME"
-# If need version check:
-# package_version_pattern = "PACKNAME-([\d\.]+)"
-# requires_qemu-kvm = [">= 0.15.1"]
-
-package_check_cmd_kernel = uname -r
-package_version_pattern_kernel = [\.\-\_\w\d]+
-# Whether we will print out debug informations during the host check
-# The default value is no.
-# host_check_verbose = yes
-
-# Host
-variants:
-    - Host_Fedora:
-        pre_check_cmd = "grep 'Fedora' /etc/issue"
-        requires_kernel = []
-        host_kernel_ver_str = Host_Fedora
-    - Host_RHEL:
-        workaround_qemu_qmp_crash = always
-        pre_check_cmd = "grep 'Red Hat Enterprise Linux' /etc/redhat-release"
-        host_kernel_ver_str = Host_RHEL
-        no migrate..x-rdma migrate..rdma migrate..mig_cancel_x_rdma migrate..mig_cancel_rdma
-        variants:
-            - 5:
-                no qcow2v3
-                host_kernel_ver_str += ".5"
-                monitor_type = human
-                monitors = hmp1
-                main_monitor = hmp1
-                machine_type = "rhel5.6.0"
-                image_cluster_size =
-                extra_params += " -usbdevice tablet"
-                enable_x2apic = no
-                netdev_peer_re = "\s{2,}(.*?): .*?\s{2,}(.*?):"
-                drive_rerror_image1 =
-                usbs = ""
-                usb_devices = ""
-                auto_cpu_model = "no"
-                cpu_model = "qemu64"
-                smp_max = 16
-                rhel5_spice = yes
-                spice_params = ic disable-ticketing
-                spice_ssl = no
-                ic = on
-                # Disable the boot image verification function on
-                # RHEL, because RHEL5 host doesn't have the seabios
-                # debug console.
-                image_verify_bootable = no
-                virtio_net, virtio_blk:
-                    image_boot_image1 = yes
-                spice:
-                    vga =
-                kexec:
-                    enable_x2apic = no
-                    check_x2apic = no
-                ksm_base:
-                    status_query_cmd = "ksmctl info"
-                    setup_cmd = "ksmctl start 5000 50"
-                    query_cmd = "top -p QEMU_PID -n  1"
-                    query_regex = "([\d\.]+\w)\s+.\s+\d+\.\d+\s+\d+\.\d+\s+\d+:\d+\.\d+\s+qemu"
-                    ksm_module = "ksm"
-                cpuinfo_query.qmachine_type:
-                    cpu_info = "pc,rhel5.4.0,rhel5.4.4,rhel5.5.0,rhel5.6.0"
-                multi_disk.max_disk:
-                    index_enable = no
-                block_hotplug.check_pci:
-                    pci_num = 25
-                    images = "image1 stg0 stg1 stg2 stg3 stg4 stg5 stg6 stg7 "
-                    images += "stg8 stg9 stg10 stg11 stg12 stg13 stg14 stg15 "
-                    images += "stg16 stg17 stg18 stg19 stg20 stg21 stg22 "
-                    images += "stg23 stg24"
-                variants:
-                    - 7:
-                        host_kernel_ver_str += ".7"
-                        requires_kernel = [">= 2.6.18-274", "<  2.6.18-308"]
-                    - 8:
-                        host_kernel_ver_str += ".8"
-                        requires_kernel = [">= 2.6.18-308", "<  2.6.18-348"]
-                    - 9:
-                        host_kernel_ver_str += ".9"
-                        requires_kernel = [">= 2.6.18-348", "<  2.6.19"]
-            - 6:
-                no qcow2v3
-                # RHEL-6 pointer
-                host_kernel_ver_str += ".6"
-                netdev_peer_re = "\s{2,}(.*?):.*?peer=(.*?)\s"
-                ksm_base:
-                    query_cmd = "cat /sys/kernel/mm/ksm/pages_sharing"
-                virtio_net:
-                    vhost = "vhost=on"
-                    nettype = bridge
-                    # enable_vhostfd only works with vhost=on
-                    enable_vhostfd = yes
-                Win2008, Win2008r2, Win7:
-                    cpu_model_flags += ",hv_relaxed"
-                block_stream, drive_mirror, live_snapshot, live_snapshot_chain:
-                    required_packages = "qemu-kvm-rhev"
-                    package_check_cmd_qemu-kvm-rhev = "rpm -q PACKNAME"
-                    package_version_pattern = "PACKNAME-([\d\.]+)"
-                monitor_cmds_check.qmp:
-                    black_cmds = "block-stream block-job-cancel block-job-set-speed transaction blockdev-snapshot-sync __com.redhat_drive-mirror __com.redhat_block-reopen"
-                monitor_cmds_check.human:
-                    black_cmds = "block_stream block_job_cancel block_job_set_speed transaction blockdev-snapshot-sync __com.redhat_drive_mirror __com.redhat_block_reopen"
-                variants:
-                    - 1:
-                        host_kernel_ver_str += ".1"
-                        requires_kernel = [">= 2.6.32-131", "<  2.6.32-220"]
-                        usbs = ""
-                        usb_devices = ""
-                        machine_type = "rhel6.1.0"
-                    - 2:
-                        host_kernel_ver_str += ".2"
-                        requires_kernel = [">= 2.6.32-220", "<  2.6.32-279"]
-                        machine_type = "rhel6.2.0"
-                    - 3:
-                        host_kernel_ver_str += ".3"
-                        requires_kernel = [">= 2.6.32-279", "<  2.6.32-280"]
-                        machine_type = "rhel6.3.0"
-                        bios_path = "/usr/share/seabios/bios-pm.bin"
-                        cpuinfo_query.qmachine_type:
-                            cpu_info = "pc,rhel6.3.0,rhel6.2.0,rhel6.1.0,rhel6.0.0,rhel5.5.0,rhel5.4.4,rhel5.4.0"
-            - 7:
-                # RHEL-7 pointer
-                host_kernel_ver_str += ".7"
-                netdev_peer_re = "\s{2,}(.*?):.*?peer=(.*?)\n"
-                drive_mirror:
-                    block_mirror_cmd = "drive-mirror"
-                    block_reopen_cmd = "block-job-complete"
-                    check_event = yes
-                ksm_base:
-                    query_cmd = "cat /sys/kernel/mm/ksm/pages_sharing"
-                flag_check:
-                    pattern = r"flags:\s+(.*)\s+(.*)\s+(.*)\s+(.*)"
-                Win2008, Win2008r2, Win7:
-                    cpu_model_flags += ",hv_relaxed"
-                virtio_net:
-                    vhost = "vhost=on"
-                    nettype = birdge
-                    # enable_vhostfd only works with vhost=on
-                    enable_vhostfd = yes
-                monitor_cmds_check.qmp:
-                    black_cmds = "block-stream block-job-cancel block-job-set-speed drive-mirror block-job-complete block-job-pause block-job-resume"
-                monitor_cmds_check.human:
-                    black_cmds = "block_stream block_job_cancel block_job_set_speed drive_mirror block_job_complete block_job_pause block_job_resume"
-                variants:
-                    - 0:
-                        host_kernel_ver_str += ".0"
-                        requires_kernel = [">= 3.2.1-0.8"]
-                        machine_type = "pc"

qemu/cfg/host-kernel/Host_Fedora.cfg

+- Host_Fedora:
+    pre_check_cmd = "grep 'Fedora' /etc/issue"
+    requires_kernel = []
+    host_kernel_ver_str = Host_Fedora

qemu/cfg/host-kernel/Host_RHEL.cfg

+- Host_RHEL:
+    workaround_qemu_qmp_crash = always
+    pre_check_cmd = "grep 'Red Hat Enterprise Linux' /etc/redhat-release"
+    host_kernel_ver_str = Host_RHEL
+    no migrate..x-rdma migrate..rdma migrate..mig_cancel_x_rdma migrate..mig_cancel_rdma

qemu/cfg/host-kernel/Host_RHEL/5.cfg

+- 5:
+    no qcow2v3
+    host_kernel_ver_str += ".5"
+    monitor_type = human
+    monitors = hmp1
+    main_monitor = hmp1
+    machine_type = "rhel5.6.0"
+    image_cluster_size =
+    extra_params += " -usbdevice tablet"
+    enable_x2apic = no
+    netdev_peer_re = "\s{2,}(.*?): .*?\s{2,}(.*?):"
+    drive_rerror_image1 =
+    usbs = ""
+    usb_devices = ""
+    auto_cpu_model = "no"
+    cpu_model = "qemu64"
+    smp_max = 16
+    rhel5_spice = yes
+    spice_params = ic disable-ticketing
+    spice_ssl = no
+    ic = on
+    # Disable the boot image verification function on
+    # RHEL, because RHEL5 host doesn't have the seabios
+    # debug console.
+    image_verify_bootable = no
+    virtio_net, virtio_blk:
+        image_boot_image1 = yes
+    spice:
+        vga =
+    kexec:
+        enable_x2apic = no
+        check_x2apic = no
+    ksm_base:
+        status_query_cmd = "ksmctl info"
+        setup_cmd = "ksmctl start 5000 50"
+        query_cmd = "top -p QEMU_PID -n  1"
+        query_regex = "([\d\.]+\w)\s+.\s+\d+\.\d+\s+\d+\.\d+\s+\d+:\d+\.\d+\s+qemu"
+        ksm_module = "ksm"
+    cpuinfo_query.qmachine_type:
+        cpu_info = "pc,rhel5.4.0,rhel5.4.4,rhel5.5.0,rhel5.6.0"
+    multi_disk.max_disk:
+        index_enable = no
+    block_hotplug.check_pci:
+        pci_num = 25
+        images = "image1 stg0 stg1 stg2 stg3 stg4 stg5 stg6 stg7 "
+        images += "stg8 stg9 stg10 stg11 stg12 stg13 stg14 stg15 "
+        images += "stg16 stg17 stg18 stg19 stg20 stg21 stg22 "
+        images += "stg23 stg24"

qemu/cfg/host-kernel/Host_RHEL/5/7.cfg

+- 7:
+    host_kernel_ver_str += ".7"
+    requires_kernel = [">= 2.6.18-274", "<  2.6.18-308"]

qemu/cfg/host-kernel/Host_RHEL/5/8.cfg

+- 8:
+      host_kernel_ver_str += ".8"
+      requires_kernel = [">= 2.6.18-308", "<  2.6.18-348"]

qemu/cfg/host-kernel/Host_RHEL/5/9.cfg

+- 9:
+    host_kernel_ver_str += ".9"
+    requires_kernel = [">= 2.6.18-348", "<  2.6.19"]

qemu/cfg/host-kernel/Host_RHEL/6.cfg

+- 6:
+    no qcow2v3
+    # RHEL-6 pointer
+    host_kernel_ver_str += ".6"
+    netdev_peer_re = "\s{2,}(.*?):.*?peer=(.*?)\s"
+    ksm_base:
+        query_cmd = "cat /sys/kernel/mm/ksm/pages_sharing"
+    virtio_net:
+        vhost = "vhost=on"
+        nettype = bridge
+        # enable_vhostfd only works with vhost=on
+        enable_vhostfd = yes
+    Win2008, Win2008r2, Win7:
+        cpu_model_flags += ",hv_relaxed"
+    block_stream, drive_mirror, live_snapshot, live_snapshot_chain:
+        required_packages = "qemu-kvm-rhev"
+        package_check_cmd_qemu-kvm-rhev = "rpm -q PACKNAME"
+        package_version_pattern = "PACKNAME-([\d\.]+)"
+    monitor_cmds_check.qmp:
+        black_cmds = "block-stream block-job-cancel block-job-set-speed transaction blockdev-snapshot-sync __com.redhat_drive-mirror __com.redhat_block-reopen"
+    monitor_cmds_check.human:
+        black_cmds = "block_stream block_job_cancel block_job_set_speed transaction blockdev-snapshot-sync __com.redhat_drive_mirror __com.redhat_block_reopen"

qemu/cfg/host-kernel/Host_RHEL/6/1.cfg

+- 1:
+    host_kernel_ver_str += ".1"
+    requires_kernel = [">= 2.6.32-131", "<  2.6.32-220"]
+    usbs = ""
+    usb_devices = ""
+    machine_type = "rhel6.1.0"

qemu/cfg/host-kernel/Host_RHEL/6/2.cfg

+- 2:
+    host_kernel_ver_str += ".2"
+    requires_kernel = [">= 2.6.32-220", "<  2.6.32-279"]
+    machine_type = "rhel6.2.0"

qemu/cfg/host-kernel/Host_RHEL/6/3.cfg

+- 3:
+    host_kernel_ver_str += ".3"
+    requires_kernel = [">= 2.6.32-279", "<  2.6.32-280"]
+    machine_type = "rhel6.3.0"
+    bios_path = "/usr/share/seabios/bios-pm.bin"
+    cpuinfo_query.qmachine_type:
+        cpu_info = "pc,rhel6.3.0,rhel6.2.0,rhel6.1.0,rhel6.0.0,rhel5.5.0,rhel5.4.4,rhel5.4.0"

qemu/cfg/host-kernel/Host_RHEL/6/4.cfg

+- 4:
+    host_kernel_ver_str += ".4"
+    requires_kernel = [">= 2.6.32-280", "<  2.6.32-359"]
+    machine_type = "rhel6.4.0"
+    i386:
+        virtio_floppy = isos/windows/virtio-win-latest-signed.vfd.i386
+    x86_64:
+        virtio_floppy = isos/windows/virtio-win-latest-signed.vfd.x86_64
+    cdrom_virtio = isos/windows/virtio-win-latest-signed.iso
+    cpuinfo_query.qmachine_type:
+        cpu_info = "pc,rhel6.4.0,rhel6.3.0,rhel6.2.0,rhel6.1.0,rhel6.0.0,rhel5.5.0,rhel5.4.4,rhel5.4.0"
+    Windows:
+        #hv_relaxed option is supported since RHEL.6.4, 1043730#c2
+        cpu_model_flags += ",hv_relaxed"

qemu/cfg/host-kernel/Host_RHEL/6/5.cfg

+- 5:
+    host_kernel_ver_str += ".5"
+    requires_kernel = [">= 2.6.32-359", "<  2.6.33-432"]
+    i386:
+        virtio_floppy = isos/windows/virtio-win-latest-signed.vfd.i386
+    x86_64:
+        virtio_floppy = isos/windows/virtio-win-latest-signed.vfd.x86_64
+    cdrom_virtio = isos/windows/virtio-win-latest-signed.iso
+    machine_type = "rhel6.5.0"
+    cpuinfo_query.qmachine_type:
+        cpu_info = "pc,rhel6.5.0,rhel6.4.0,rhel6.3.0,rhel6.2.0,rhel6.1.0,rhel6.0.0,rhel5.5.0,rhel5.4.4,rhel5.4.0"
+    Windows:
+        #hv_relaxed option is supported since RHEL.6.4, 1043730#c2
+        cpu_model_flags += ",hv_relaxed"

qemu/cfg/host-kernel/Host_RHEL/7.cfg

+- 7:
+    # RHEL-7 pointer
+    host_kernel_ver_str += ".7"
+    netdev_peer_re = "\s{2,}(.*?):.*?peer=(.*?)\n"
+    drive_mirror:
+        block_mirror_cmd = "drive-mirror"
+        block_reopen_cmd = "block-job-complete"
+        check_event = yes
+    ksm_base:
+        query_cmd = "cat /sys/kernel/mm/ksm/pages_sharing"
+    flag_check:
+        pattern = r"flags:\s+(.*)\s+(.*)\s+(.*)\s+(.*)"
+    Win2008, Win2008r2, Win7:
+        cpu_model_flags += ",hv_relaxed"
+    virtio_net:
+        vhost = "vhost=on"
+        nettype = birdge
+        # enable_vhostfd only works with vhost=on
+        enable_vhostfd = yes
+    monitor_cmds_check.qmp:
+        black_cmds = "block-stream block-job-cancel block-job-set-speed drive-mirror block-job-complete block-job-pause block-job-resume"
+    monitor_cmds_check.human:
+        black_cmds = "block_stream block_job_cancel block_job_set_speed drive_mirror block_job_complete block_job_pause block_job_resume"

qemu/cfg/host-kernel/Host_RHEL/7/0.cfg

+- 0:
+    host_kernel_ver_str += ".0"
+    requires_kernel = [">= 3.2.1-0.8"]
+    machine_type = "pc"

qemu/cfg/host-kernel/host-kernel-check.cfg

+# Host kernel related parameters
+# Here will set up a set up parameters for the test based on the different
+# kernel installed in RHEL system. You can also edit this to match other
+# packages in the host under test.
+
+package_check_cmd_kernel = uname -r
+package_version_pattern_kernel = [\.\-\_\w\d]+
+# Whether we will print out debug informations during the host check
+# The default value is no.
+# host_check_verbose = yes
+required_packages = kernel
+# Host
+variants:
+    - Host_Fedora:
+        pre_check_cmd = "grep 'Fedora' /etc/issue"
+        requires_kernel = []
+        host_kernel_ver_str = Host_Fedora
+    - Host_RHEL:
+        pre_check_cmd = "grep 'Red Hat Enterprise Linux' /etc/redhat-release"
+        host_kernel_ver_str = Host_RHEL
+        variants:
+            - 5:
+                host_kernel_ver_str += ".5"
+                variants:
+                    - 7:
+                        host_kernel_ver_str += ".7"
+                        requires_kernel = [">= 2.6.18-274", "<  2.6.18-308"]
+                    - 8:
+                        host_kernel_ver_str += ".8"
+                        requires_kernel = [">= 2.6.18-308", "<  2.6.18-348"]
+                    - 9:
+                        host_kernel_ver_str += ".9"
+                        requires_kernel = [">= 2.6.18-348", "<  2.6.18-349"]
+            - 6:
+                host_kernel_ver_str += ".6"
+                variants:
+                    - 1:
+                        host_kernel_ver_str += ".1"
+                        requires_kernel = [">= 2.6.32-131", "<  2.6.32-220"]
+                    - 2:
+                        host_kernel_ver_str += ".2"
+                        requires_kernel = [">= 2.6.32-220", "<  2.6.32-279"]
+                    - 3:
+                        host_kernel_ver_str += ".3"
+                        requires_kernel = [">= 2.6.32-279", "<  2.6.32-280"]
+                    - 4:
+                        host_kernel_ver_str += ".4"
+                        requires_kernel = [">= 2.6.32-280", "<  2.6.32-359"]
+                    - 5:
+                        host_kernel_ver_str += ".5"
+                        requires_kernel = [">= 2.6.32-359", "<  2.6.33-432"]
+            - 7:
+                host_kernel_ver_str += ".7"
+                variants:
+                    - 0:
+                        host_kernel_ver_str += ".0"
+                        requires_kernel = [">= 3.2.1-0.8"]