mshv_root_tests: Pass --log-file parameter to cloud-hypervisor

This is to reduce stdout logs when cloud-hypervisor is run from LISA
microsoft · Sep 8, 2023 · f7c31de · f7c31de
1 parent 262b333
commit f7c31de
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/microsoft/testsuites/mshv/cloud_hypervisor_tool.py b/microsoft/testsuites/mshv/cloud_hypervisor_tool.py
@@ -27,9 +27,11 @@ def start_vm_async(
         sudo: bool = False,
         guest_vm_type: str = "NON-CVM",
         igvm_path: str = "",
+        log_file: str = "",
     ) -> Process:
         opt_disk_readonly = "on" if disk_readonly else "off"
-        args: str = f'--cpus boot={cpus} --memory size={memory_mb}M --disk "path={disk_path},readonly={opt_disk_readonly}" --net "tap=,mac=,ip=,mask="'  # noqa: E501
+        log_file_arg = f"--log-file {log_file}" if log_file else ""
+        args: str = f'--cpus boot={cpus} --memory size={memory_mb}M --disk "path={disk_path},readonly={opt_disk_readonly}" {log_file_arg} --net "tap=,mac=,ip=,mask="'  # noqa: E501
 
         if guest_vm_type == "CVM":
             host_data = secrets.token_hex(32)

diff --git a/microsoft/testsuites/mshv/mshv_root_tests.py b/microsoft/testsuites/mshv/mshv_root_tests.py
@@ -157,6 +157,7 @@ def _mshv_stress_vm_create(
             procs = []
             for i in range(vm_count):
                 vm_disk_img_path = disk_img_copy_path / f"VM{i}_{self.DISK_IMG_NAME}"
+                vm_log_file_path = disk_img_copy_path / f"CH_VM{i}.log"
                 is_os_disk_present = node.tools[Ls].path_exists(str(vm_disk_img_path))
                 if not is_os_disk_present:
                     node.tools[Cp].copy(
@@ -174,7 +175,13 @@ def _mshv_stress_vm_create(
                     sudo=True,
                     guest_vm_type=guest_vm_type,
                     igvm_path=igvm_path,
+                    log_file=str(vm_log_file_path),
                 )
+                if not p:
+                    node.shell.copy_back(
+                        vm_log_file_path,
+                        log_path / vm_log_file_path,
+                    )
                 assert_that(p).described_as(f"Failed to create VM {i}").is_not_none()
                 procs.append(p)
                 node.tools[Free].log_memory_stats_mb()
@@ -203,6 +210,8 @@ def _mshv_stress_vm_create(
         for i in range(vm_count):
             disk_img_file = disk_img_copy_path / f"VM{i}_{self.DISK_IMG_NAME}"
             node.tools[Rm].remove_file(str(disk_img_file), sudo=True)
+            vm_log_file = disk_img_copy_path / f"CH_VM{i}.log"
+            node.tools[Rm].remove_file(str(vm_log_file), sudo=True)
 
         assert_that(failures).is_equal_to(0)