qemu_cpu.cfg: clean up the vendor list on check_models

Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>

qemu/tests/cfg/qemu_cpu.cfg

@@ -9,19 +9,16 @@
         - check_models:
             test_type = "test_qemu_cpu_models_list"
             cpu_models = "qemu64 phenom core2duo kvm64 qemu32"
-            #FIXME: reorder the code to make it cleaner, put the host-specific
-            # models at the end of the list
-            variants:
-                - rhel64:
-                - qemu13:
-                    cpu_models += " kvm32"
             cpu_models += " coreduo 486 pentium pentium2"
             cpu_models += " pentium3 athlon n270 Conroe Penryn"
             cpu_models += " Nehalem Westmere SandyBridge Haswell"
             cpu_models += " Opteron_G1 Opteron_G2 Opteron_G3"
             cpu_models += " Opteron_G4 Opteron_G5"
-            rhel64:
-                cpu_models += " cpu64-rhel6 cpu64-rhel5"
+            variants:
+                - rhel64:
+                    cpu_models += " cpu64-rhel6 cpu64-rhel5"
+                - qemu13:
+                    cpu_models += " kvm32"
         - default.vendor:
             test_type = "default_vendor"
             variants: