qemu_cpu.cfg: create named variants for multiple QEMU versions

Keep only the "unknown QEMU version" variant enabled, but allow people
to enable other variants if desired.
Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>

qemu/tests/cfg/qemu_cpu.cfg

@@ -9,15 +9,28 @@
     auto_cpu_model = no
 
     # QEMU versions:
-    variants:
-        - unknown_qemu:
-        - rhel64:
-        - qemu13:
+    variants qemu_flavor:
+        - @unknown:
+        - rhel:
+            variants rhel_version:
+                - 6_0:
+                - 6_1:
+                - 6_2:
+                - 6_3:
+                - 6_4:
+        - upstream:
+            variants qemu_version:
+                - 1_0:
+                - 1_1:
+                - 1_2:
+                - 1_3:
+                - 1_4:
+                - 1_5:
 
     # uncomment the line corresponding to the QEMU version, if you know it:
-    only unknown_qemu
-    #only rhel64
-    #only qemu13
+    only (qemu_flavor = unknown)
+    #only (qemu_flavor = rhel).(rhel_version = 6_4)
+    #only (qemu_flavor = upstream).(qemu_version = 1_5)
 
     # CPU model lists:
     variants:
@@ -76,10 +89,10 @@
                 - Opteron_G5:
                     cpu_model = "Opteron_G5"
                 - cpu64_rhel6:
-                    only rhel64
+                    only (qemu_flavor = rhel)
                     cpu_model = "cpu64-rhel6"
                 - cpu64_rhel4:
-                    only rhel64
+                    only (qemu_flavor = rhel)
                     cpu_model = "cpu64-rhel5"
 
     variants:
@@ -96,7 +109,7 @@
             only nokvm
             # we don't know if all models will be available if QEMU
             # version is unknown:
-            no unknown_qemu
+            no (qemu_flavor = unknown)
         # CPUID data tests:
         - cpuid:
             # 486 is excluded due to not supporting cpuid
@@ -116,7 +129,7 @@
                     nokvm:
                         # we don't know if all models will be available if QEMU
                         # version is unknown:
-                        no unknown_qemu
+                        no (qemu_flavor = unknown)
                         only cpu.intel cpu.amd
                         cpu.intel:
                                 vendor = "GenuineIntel"