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"

microdroid/bootconfig.common

diff --git a/microdroid/bootconfig.common b/microdroid/bootconfig.common
index 362ff23..f2c8788 100644
--- a/microdroid/bootconfig.common
+++ b/microdroid/bootconfig.common
@@ -1,3 +1,3 @@
 androidboot.first_stage_console = 1
 androidboot.hardware = microdroid
-kernel.8250.nr_uarts = 2
+kernel.8250.nr_uarts = 4

virtualizationservice/src/aidl.rs

diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 23febed..f0b3fb4 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -1090,7 +1090,7 @@
             vm.callbacks.notify_error(cid, error_code, message);
             Ok(())
         } else {
-            error!("notifyPayloadStarted is called from an unknown CID {}", cid);
+            error!("notifyError is called from an unknown CID {}", cid);
             Err(new_binder_exception(
                 ExceptionCode::SERVICE_SPECIFIC,
                 format!("cannot find a VM with CID {}", cid),

vmbase/example/Android.bp

diff --git a/vmbase/example/Android.bp b/vmbase/example/Android.bp
index 0acef2b..a0d84b4 100644
--- a/vmbase/example/Android.bp
+++ b/vmbase/example/Android.bp
@@ -47,6 +47,9 @@
             enabled: true,
         },
     },
+    sanitize: {
+        hwaddress: false,
+    },
     apex_available: ["com.android.virt"],
 }