memory_binding_setting: fix cgroup v1 checking

Signed-off-by: Dan Zheng <[email protected]>
autotest · Jun 30, 2023 · 6a3c2d8 · 6a3c2d8
1 parent 62bf1b9
commit 6a3c2d8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libvirt/tests/src/numa/guest_numa_node_tuning/memory_binding_setting.py b/libvirt/tests/src/numa/guest_numa_node_tuning/memory_binding_setting.py
@@ -165,8 +165,9 @@ def verify_cgroup(test_obj):
     mem_mode = test_obj.params.get('mem_mode')
     nodeset = numa_base.convert_to_string_with_dash(test_obj.params.get('nodeset'))
     vm_pid = test_obj.vm.get_pid()
-    cg = libvirt_cgroup.CgroupTest(vm_pid)
-    cpuset_mems_cgroup_path = os.path.join(cg.get_cgroup_path(), 'emulator/cpuset.mems')
+    cg = libvirt_cgroup.CgroupTest(vm_pid)    
+    surfix = 'emulator/cpuset.mems' if cg.is_cgroup_v2_enabled() else 'cpuset.mems'
+    cpuset_mems_cgroup_path = os.path.join(cg.get_cgroup_path(controller='cpuset'), surfix)
     cmd = 'cat %s' % re.escape(cpuset_mems_cgroup_path)
     cpuset_mems = process.run(cmd, shell=True).stdout_text.strip()
     if mem_mode in ['strict', 'restrictive']: