qemu_cpu.cfg: rules to set cpu_model_flags on specific cases

Add some new variants/rules that will run some tests using
additional cpu_model_flags values. Especially:

 * CPU models that require "+apic" to be run on RHEL-6 hosts on Intel
   CPUs
 * CPU models that require "-abm,-sse4a" on Intel CPUs
 * CPU models that require using "-svm" because we don't enable nesting
   by default
Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>

qemu/tests/cfg/qemu_cpu.cfg

@@ -189,15 +189,33 @@
                         no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630
 
 
+                    # Some CPU models require "+apic" to be forced on some hosts:
+                    variants apic_flag:
+                        - default:
+                            # we know those models won't run on Intel hosts on RHEL-6:
+                            cpu.intel.486, cpu.intel.pentium, cpu.intel.pentium2, cpu.intel.pentium3:
+                                no (rhel_major_version = 6)..(host_cpu_vendor = intel)
+                        - force:
+                            only cpu.intel.486, cpu.intel.pentium, cpu.intel.pentium2, cpu.intel.pentium3
+                            cpu_model_flags += ",+apic"
+
+                    # some models require "-abm,-sse4a" to run on Intel host CPUs:
+                    variants abm_sse4a:
+                        - default:
+                        - disable:
+                            only cpu.amd.qemu64, cpu.amd.cpu64_rhel6, cpu.amd.cpu64_rhel5
+                            cpu_model_flags += ",-abm,-sse4a"
+
                     # Some CPU models can't be easily tested with all the flags
                     # due to lack of host-side support, so check using
                     # explicit "-flag" parameters
-                    kvm:
-                        # We have to disable the SVM flag because we are not running QEMU with
-                        # -enable-nesting:
-                        cpu.amd.qemu64, cpu.amd.cpu64_rhel5, cpu.amd.cpu64_rhel6, cpu.amd.phenom, cpu.amd.Opteron_G1, cpu.amd.Opteron_G2, cpu.amd.Opteron_G3, cpu.amd.Opteron_G4, cpu.amd.Opteron_G5:
-                            cpu_model_flags += ",-svm"
 
+                    # We have to disable the SVM flag because we are not running QEMU with
+                    # -enable-nesting:
+                    cpu.amd.qemu64, cpu.amd.cpu64_rhel5, cpu.amd.cpu64_rhel6, cpu.amd.phenom, cpu.amd.Opteron_G1, cpu.amd.Opteron_G2, cpu.amd.Opteron_G3, cpu.amd.Opteron_G4, cpu.amd.Opteron_G5:
+                        cpu_model_flags += ",-svm"
+
+                    kvm:
                         # KVM doesn't support the "monitor" flag, so we have
                         # to explicitly disable it:
                         cpu.intel.core2duo, cpu.intel.coreduo, cpu.intel.n270, cpu.amd.Opteron_G3, cpu.amd.phenom:
@@ -233,11 +251,6 @@
                     # (to be fixed on QEMU 1.6.0)
                     ignore_cpuid_leaves += " 0xA"
 
-                    # CPU models without the "apic" feature can't boot
-                    # using RHEL-6 Seabios
-                    machine.rhel:
-                        no cpu.intel.pentium, cpu.intel.pentium2, cpu.intel.pentium3
-
                     # known RHEL-6 ABI breakage bugs:
                     machine.rhel:
                         # Max physical address depends on host: