commit 0c99c61f393400700e5737d4984abcf99110c6c9
author Jaewan Kim <jaewan@google.com> Sat Mar 23 00:44:14 2024 +0900
committer Jaewan Kim <jaewan@google.com> Tue Mar 26 02:27:40 2024 +0000
tree 762795cf0f4e8caf2326ccd8c22ec72b05906172
parent 1da2d5d07fd919ede75e53859d3ed3f28e751ff4

Add more strict device assignment test

Bug: 326539895
Test: atest MicrodroidHostTestCases
Change-Id: Icf7deafaaad586131026c8de864ec97539d37996

vm/src/main.rs

diff --git a/vm/src/main.rs b/vm/src/main.rs
index bc05ec3..b60f2db 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -30,6 +30,7 @@
 use create_idsig::command_create_idsig;
 use create_partition::command_create_partition;
 use run::{command_run, command_run_app, command_run_microdroid};
+use serde::Serialize;
 use std::num::NonZeroU16;
 use std::path::{Path, PathBuf};
 
@@ -402,8 +403,17 @@
         println!("VFIO-platform is not supported.");
     }
 
+    #[derive(Serialize)]
+    struct AssignableDevice {
+        node: String,
+        dtbo_label: String,
+    }
+
     let devices = get_service()?.getAssignableDevices()?;
-    let devices = devices.into_iter().map(|x| x.node).collect::<Vec<_>>();
+    let devices: Vec<_> = devices
+        .into_iter()
+        .map(|device| AssignableDevice { node: device.node, dtbo_label: device.dtbo_label })
+        .collect();
     println!("Assignable devices: {}", serde_json::to_string(&devices)?);
 
     let os_list = get_service()?.getSupportedOSList()?;