commit 13af0b616aee1cfe832485501eccec57b123a866
author Seungjae Yoo <seungjaeyoo@google.com> Mon May 20 14:15:13 2024 +0900
committer Seungjae Yoo <seungjaeyoo@google.com> Tue May 21 11:25:43 2024 +0900
tree f095ff968963d9afadd24b22312d22b0149549ed
parent 2af7b9f4acde2e4fc2891015c0a774ff168ab7e8

bin/vm run-microdroid supports --network-supported flag.

Bug: 340376951
Test: adb shell /apex/com.android.virt/bin/vm run-microdroid
--network-supported
Test: adb shell /apex/com.android.virt/bin/vm run-microdroid
--network-supported --protected

Change-Id: I1d88fe11d79b8ea46e12b6dfaab318aabdc0a2e0

vm/src/main.rs

diff --git a/vm/src/main.rs b/vm/src/main.rs
index d6ee3a5..390a60d 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -60,6 +60,23 @@
     /// https://docs.kernel.org/admin-guide/mm/transhuge.html
     #[arg(short, long)]
     hugepages: bool,
+
+    /// Run VM with network feature.
+    #[cfg(network)]
+    #[arg(short, long)]
+    network_supported: bool,
+}
+
+impl CommonConfig {
+    #[cfg(network)]
+    fn network_supported(&self) -> bool {
+        self.network_supported
+    }
+
+    #[cfg(not(network))]
+    fn network_supported(&self) -> bool {
+        false
+    }
 }
 
 #[derive(Args, Default)]

vm/src/run.rs

diff --git a/vm/src/run.rs b/vm/src/run.rs
index 5e797f8..0c9fbb6 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -159,6 +159,7 @@
                 x.to_str().map(String::from).ok_or(anyhow!("Failed to convert {x:?} to String"))
             })
             .collect::<Result<_, _>>()?,
+        networkSupported: config.common.network_supported(),
         ..Default::default()
     };