Merge pull request #1048 from ehabkost/cpuid-fixes

CPUID config file updates

qemu/tests/cfg/qemu_cpu.cfg

@@ -215,6 +215,10 @@
                     # -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"
+                        #FIXED BUG: QEMU reported SVM feature information even
+                        # when SVM was disabled. Now it is all zeroes:
+                        machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630, machine.rhel.rhel640:
+                            ignore_cpuid_leaves += " 0x8000000a"
 
                     kvm:
                         # KVM doesn't support the "monitor" flag, so we have
@@ -226,6 +230,7 @@
                     # CPU vendor:
                     kvm:
                         ignore_cpuid_leaves += " 0,0,ebx 0,0,ecx 0,0,edx"
+                        ignore_cpuid_leaves += " 0x80000000,0,ebx 0x80000000,0,ecx 0x80000000,0,edx"
 
                     #KNOWN BUG: Processor Extended State leaf depends on host,
                     # currently: