Merge pull request #5918 from liang-cong-red-hat/memory_misc_hugepage…

…_allocation_cleanup Fail test case when huge page is not enough, and add huge page cleanup.
autotest · Sep 26, 2024 · b9aa15f · b9aa15f
2 parents df8581f + 3b51e5d
commit b9aa15f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/libvirt/tests/src/memory/memory_misc.py b/libvirt/tests/src/memory/memory_misc.py
@@ -266,8 +266,8 @@ def _setup_mbxml():
                 test, pg_size=default_page_size, hp_size=pagesize, hp_list=[mount_pagesize])
             vm_mem_size = vmxml.memory
             hp_cfg = test_setup.HugePageConfig(params)
-            hp_cfg.set_kernel_hugepages(pagesize, vm_mem_size // pagesize)
-            hp_cfg.set_kernel_hugepages(mount_pagesize, mem_device_size // mount_pagesize)
+            hp_cfg.set_kernel_hugepages(pagesize, vm_mem_size // pagesize, False)
+            hp_cfg.set_kernel_hugepages(mount_pagesize, mem_device_size // mount_pagesize, False)
             set_vmxml(vmxml, params)
             _setup_mbxml()
             vmxml.sync()
@@ -454,6 +454,9 @@ def cleanup_test_memorybacking(case):
             utils_disk.umount('hugetlbfs', mount_path, 'hugetlbfs')
             if os.path.exists(mount_path):
                 os.rmdir(mount_path)
+            hp_cfg = test_setup.HugePageConfig(params)
+            hp_cfg.set_kernel_hugepages(int(params.get('mount_pagesize')), 0)
+            hp_cfg.cleanup()
 
     def run_test_edit_mem(case):
         """