commit 9938f8d8e990f952c468d436eb2d9c7bcec37d56
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 20 09:57:20 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 20 09:57:20 2022 +0000
tree a32bb43c132e24eaef3b820d58f523d1a081433c
parent ec8c160c4ce71893962f5ce0dce5cf89c07a9549
parent 0df48509395189667beecb5e81dd5c6871bfa095

Merge "Allow VM logging from compos_verify"

compos/common/compos_client.rs

diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index fe31b27..1fd939d 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -58,8 +58,6 @@
     pub config_path: Option<String>,
     /// If present, overrides the amount of RAM to give the VM
     pub memory_mib: Option<i32>,
-    /// Never save VM logs to files.
-    pub never_log: bool,
 }
 
 impl ComposClient {
@@ -94,7 +92,7 @@
             (true, false) => DebugLevel::NONE,
         };
 
-        let (console_fd, log_fd) = if parameters.never_log || debug_level == DebugLevel::NONE {
+        let (console_fd, log_fd) = if debug_level == DebugLevel::NONE {
             (None, None)
         } else {
             // Console output and the system log output from the VM are redirected to file.

compos/verify/verify.rs

diff --git a/compos/verify/verify.rs b/compos/verify/verify.rs
index 7a22cfd..64ae75f 100644
--- a/compos/verify/verify.rs
+++ b/compos/verify/verify.rs
@@ -104,7 +104,7 @@
         instance_image,
         &idsig,
         &idsig_manifest_apk,
-        &VmParameters { debug_mode, never_log: !debug_mode, ..Default::default() },
+        &VmParameters { debug_mode, ..Default::default() },
     )?;
     let service = vm_instance.get_service()?;