cpuid: Create a variant grouping all rhel6 machine-types

Signed-off-by: NEduardo Habkost <ehabkost@raisama.net>

qemu/tests/cfg/qemu_cpu.cfg

@@ -161,18 +161,20 @@
                         - machine.rhel:
                             only (qemu_flavor = rhel), (qemu_flavor = unknown)
                             variants:
-                                - rhel600:
-                                    machine_type_to_check = "rhel6.0.0"
-                                - rhel610:
-                                    machine_type_to_check = "rhel6.1.0"
-                                - rhel620:
-                                    machine_type_to_check = "rhel6.2.0"
-                                - rhel630:
-                                    machine_type_to_check = "rhel6.3.0"
-                                - rhel640:
-                                    machine_type_to_check = "rhel6.4.0"
-                                - rhel650:
-                                    machine_type_to_check = "rhel6.5.0"
+                                - rhel6:
+                                    variants:
+                                        - rhel600:
+                                            machine_type_to_check = "rhel6.0.0"
+                                        - rhel610:
+                                            machine_type_to_check = "rhel6.1.0"
+                                        - rhel620:
+                                            machine_type_to_check = "rhel6.2.0"
+                                        - rhel630:
+                                            machine_type_to_check = "rhel6.3.0"
+                                        - rhel640:
+                                            machine_type_to_check = "rhel6.4.0"
+                                        - rhel650:
+                                            machine_type_to_check = "rhel6.5.0"
                         - machine.upstream:
                             only (qemu_flavor = upstream), (qemu_flavor = unknown)
                             variants:
@@ -198,17 +200,17 @@
 
                     # Optimization: models/machine-type combinations known to not be valid:
                     cpu.intel.Westmere:
-                        no machine.rhel.rhel600
+                        no machine.rhel.rhel6.rhel600
                     cpu.intel.SandyBridge:
-                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620
+                        no machine.rhel.rhel6.rhel600, machine.rhel.rhel6.rhel610, machine.rhel.rhel6.rhel620
                     cpu.intel.Haswell:
-                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630
+                        no machine.rhel.rhel6.rhel600, machine.rhel.rhel6.rhel610, machine.rhel.rhel6.rhel620, machine.rhel.rhel6.rhel630
                     cpu.intel.kvm32:
                         no machine.rhel
                     cpu.amd.Opteron_G4:
-                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620
+                        no machine.rhel.rhel6.rhel600, machine.rhel.rhel6.rhel610, machine.rhel.rhel6.rhel620
                     cpu.amd.Opteron_G5:
-                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630
+                        no machine.rhel.rhel6.rhel600, machine.rhel.rhel6.rhel610, machine.rhel.rhel6.rhel620, machine.rhel.rhel6.rhel630
 
 
                     # Some CPU models require "+apic" to be forced on some hosts:
@@ -240,7 +242,7 @@
                         cpu_model_flags += ",-svm"
                         #FIXED BUG: QEMU reported SVM feature information even
                         # when SVM was disabled. Now it is all zeroes:
-                        machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630, machine.rhel.rhel640, machine.rhel.rhel650:
+                        machine.rhel.rhel6.rhel600, machine.rhel.rhel6.rhel610, machine.rhel.rhel6.rhel620, machine.rhel.rhel6.rhel630, machine.rhel.rhel6.rhel640, machine.rhel.rhel6.rhel650:
                             ignore_cpuid_leaves += " 0x8000000a"
 
                     kvm:
@@ -352,7 +354,7 @@
                         ignore_cpuid_leaves += " 0x40000001,0,eax"
 
                     # SEP bit depended on host kernel on 6.3 and older:
-                    machine.rhel.rhel630, machine.rhel.rhel620, machine.rhel.rhel610, machine.rhel.rhel600:
+                    machine.rhel.rhel6.rhel630, machine.rhel.rhel6.rhel620, machine.rhel.rhel6.rhel610, machine.rhel.rhel6.rhel600:
                         ignore_cpuid_leaves += " 1,0,edx,11"
 
                     # unsupported-bits behavior changed between some RHEL-6
@@ -363,7 +365,7 @@
                     #FIXED BUG: RHEL-6.0 QEMU had broken feature aliases on
                     # 0x80000001.EDX and they were fixed without adding any
                     # compat code, so ignore those bits:
-                    machine.rhel.rhel600:
+                    machine.rhel.rhel6.rhel600:
                         cpu.intel:
                             # alias bits were removed on Intel CPU models
                             ignore_cpuid_leaves += " 0x80000001,0x00,edx,0"
@@ -392,7 +394,7 @@
 
                     #KNOWN BUG: RHEL-6 has broken feature aliases on
                     # 0x80000001.EDX and they were not fixed, so ignore them:
-                    machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630, machine.rhel.rhel640, machine.rhel.rhel650:
+                    machine.rhel.rhel6.rhel600, machine.rhel.rhel6.rhel610, machine.rhel.rhel6.rhel620, machine.rhel.rhel6.rhel630, machine.rhel.rhel6.rhel640, machine.rhel.rhel6.rhel650:
                         cpu.amd.athlon, cpu.amd.cpu64_rhel6, cpu.intel.kvm64, cpu.amd.qemu64:
                             # vme, mtrr, mca, pse36
                             ignore_cpuid_leaves += " 0x80000001,0x0,edx,1"
@@ -401,7 +403,7 @@
                             ignore_cpuid_leaves += " 0x80000001,0x0,edx,17"
 
                     # bz#819562: broken passthrough mode of CPUID leaf 7
-                    machine.rhel.rhel620:
+                    machine.rhel.rhel6.rhel620:
                         ignore_cpuid_leaves += " 7,0"
 
                     #KNOWN BUG: Intel models had SVM information available,