From: Mike Qiu <[email protected]> Currently, the function get_host_cpu_models just return the models for intel and amd's X86 cpus.
Add ppc64 model return for IBM Power architecture Signed-off-by: Mike Qiu <[email protected]> --- virttest/utils_misc.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/virttest/utils_misc.py b/virttest/utils_misc.py index f1904dc..b0b02f2 100644 --- a/virttest/utils_misc.py +++ b/virttest/utils_misc.py @@ -1134,7 +1134,7 @@ def get_host_cpu_models(): pattern += r".+(\b%s\b)" % i return pattern - vendor_re = "vendor_id\s+:\s+(\w+)" + vendor_re = "(vendor_id|cpu)\s+:\s+(\w+)" cpu_flags_re = "flags\s+:\s+([\w\s]+)\n" cpu_types = {"AuthenticAMD": ["Opteron_G4", "Opteron_G3", "Opteron_G2", @@ -1157,10 +1157,13 @@ def get_host_cpu_models(): cpu_info = fd.read() fd.close() - vendor = re.findall(vendor_re, cpu_info)[0] + vendor = re.findall(vendor_re, cpu_info)[0][1] cpu_flags = re.findall(cpu_flags_re, cpu_info) cpu_support_model = [] + if 'POWER7' in vendor: + return ['POWER7'] + if cpu_flags: cpu_flags = _cpu_flags_sort(cpu_flags[0]) for cpu_type in cpu_types.get(vendor): -- 1.7.7.6 _______________________________________________ Virt-test-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/virt-test-devel
