qemu_cpu.cfg: no need to have host-specific variants of default.vendor.kvm

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

qemu/tests/cfg/qemu_cpu.cfg

@@ -29,9 +29,6 @@
                     ignore_cpu_models = "486"
                     # if 'vendor' is missing then host's vendor value is used
                     # kvm by default overides vendor with host's value
-                    rhel64:
-                         #FIXME: shouldn't be set
-                        vendor = "GenuineIntel"
                 - nokvm:
                     enable_kvm = "no"
                     disable_kvm = "yes"
@@ -54,10 +51,9 @@
                             cpu_models += " Opteron_G5"
                             rhel64:
                                     cpu_models += " cpu64-rhel6 cpu64-rhel5"
-            variants:
-                #FIXME: we don't need rhel64/qemu13 variants for the kvm default vendor test
-                - qemu13:
-                - rhel64:
+                    variants:
+                        - qemu13:
+                        - rhel64:
         # CPUID data tests:
         - cpuid.custom:
             variants: