qemu_cpu.cfg: exceptions for cases where the full CPU model can't be tested

Add extra CPU model flags to some CPU models when the full CPU model
can't be tested easily.

Note that the code loads the reference files using the CPU flags as part
of the file name too (so we can be sure we're reading the right dump
file)  This way we can be sure we are comparing the output of "-cpu
Foo,-flag" against a dump that was surely generated using "-cpu
Foo,-flag" as well (not just "-cpu Foo").
Signed-off-by: NEduardo Habkost <ehabkost@raisama.net>

qemu/tests/cfg/qemu_cpu.cfg

@@ -159,6 +159,35 @@
                     test_type = "check_cpuid_dump"
                     no cpu.unset
 
+                    # Optimization: models/machine-type combinations known to not be valid:
+                    cpu.intel.Westmere:
+                        no machine.rhel.rhel600
+                    cpu.intel.SandyBridge:
+                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620
+                    cpu.intel.Haswell:
+                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630
+                    cpu.intel.kvm32:
+                        no machine.rhel
+                    cpu.amd.Opteron_G4:
+                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620
+                    cpu.amd.Opteron_G5:
+                        no machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630
+
+
+                    # 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"
+
+                        # 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:
+                            cpu_model_flags += ",-monitor"
+
                     #FEATURE: Ignore vendor string on KVM because it depends on host
                     # CPU vendor:
                     kvm: