commit eb60533b24f4a268e7ee141f7de55296e10bac1a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 28 05:06:55 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 28 05:06:55 2022 +0000
tree 050a23bfb4d3fcbec966f2a8ecbf39c9209d72e6
parent 6e238c25d5f6fcfa01e112579fc62c9f166943a9
parent 7f60edac12f02e8608c0b2970a5b9ce1410bb3e8

Merge "Add the golden list of microdroid contents"

compos/common/compos_client.rs

diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index d738e39..9787434 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -68,6 +68,8 @@
     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 VmInstance {
@@ -109,7 +111,9 @@
             (true, false) => DebugLevel::NONE,
         };
 
-        let (console_fd, log_fd) = if debug_level != DebugLevel::NONE {
+        let (console_fd, log_fd) = if parameters.never_log || debug_level == DebugLevel::NONE {
+            (None, None)
+        } else {
             // Console output and the system log output from the VM are redirected to file.
             let console_fd = File::create(data_dir.join("vm_console.log"))
                 .context("Failed to create console log file")?;
@@ -117,10 +121,8 @@
                 .context("Failed to create system log file")?;
             let console_fd = ParcelFileDescriptor::new(console_fd);
             let log_fd = ParcelFileDescriptor::new(log_fd);
-            info!("Running in debug mode");
+            info!("Running in debug level {:?}", debug_level);
             (Some(console_fd), Some(log_fd))
-        } else {
-            (None, None)
         };
 
         let config_path = parameters.config_path.as_deref().unwrap_or(DEFAULT_VM_CONFIG_PATH);

compos/verify/verify.rs

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