Merge pull request #5886 from smitterl/cpu_top

capabilities: don't check cluster_id on s390x

libvirt/tests/src/virsh_cmd/host/virsh_capabilities.py

@@ -73,6 +73,7 @@ def _compare_value(cmd, value_in_capxml, key_in_cpu):
     current_arch = platform.machine()
     is_x8664 = True if current_arch == "x86_64" else False
     is_aarch64 = True if current_arch == "aarch64" else False
+    is_s390x = True if current_arch == "s390x" else False
     prefix_cmd = "cat /sys/devices/system/cpu/cpu%s/topology/%s"
     file_name_key_mapping = {"physical_package_id": "socket_id",
                              "cluster_id": "cluster_id",
@@ -82,6 +83,8 @@ def _compare_value(cmd, value_in_capxml, key_in_cpu):
         file_name_key_mapping.update({"die_id": "die_id"})
     if is_aarch64 or is_x8664:
         file_name_key_mapping.update({"cluster_id": "cluster_id"})
+    if is_s390x:
+        del file_name_key_mapping["cluster_id"]
     for a_cell in cell_list:
         cpu_list = a_cell.cpu
         for a_cpu in cpu_list: