diff --git a/qemu/tests/cfg/qemu_cpu.cfg b/qemu/tests/cfg/qemu_cpu.cfg index 48d1a9b3534b40bdf5998e72e03008fc8184b037..56be5335953934b0872bad5dfe5a901d6bd07fb7 100644 --- a/qemu/tests/cfg/qemu_cpu.cfg +++ b/qemu/tests/cfg/qemu_cpu.cfg @@ -157,6 +157,8 @@ machine_type_to_check = "rhel6.3.0" - rhel640: machine_type_to_check = "rhel6.4.0" + - rhel650: + machine_type_to_check = "rhel6.5.0" - machine.upstream: only (qemu_flavor = upstream) variants: @@ -222,7 +224,7 @@ 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: + machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630, machine.rhel.rhel640, machine.rhel.rhel650: ignore_cpuid_leaves += " 0x8000000a" kvm: @@ -294,7 +296,7 @@ #KNOWN BUG: RHEL-6 has broken feature aliases on # 0x80000001.EDX and they were not fixed, so ignore them: - machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630, machine.rhel.rhel640: + machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630, machine.rhel.rhel640, machine.rhel.rhel650: cpu.amd.athlon, cpu.amd.cpu64_rhel6, cpu.intel.kvm64: # vme, mtrr, mca, pse36 ignore_cpuid_leaves += " 0x80000001,0x0,edx,1"