[VirtMgr] Allow host-controlled avf/untrusted prop
Allow addition of properties at /avf/untrusted in the DT overlay
created by virtmgr. While I'm here, refactor reference_dt into
dt_overlay to allow this & remove confusion of reference DT which from
the pt. of view of pVM is expected from ABL.
Include (a hardcoded) instance_id of VM in the DT overlay!
Test: vm_shell start-microdroid --auto-connect
Test: Check /proc/device-tree/avf/untrusted/instance-id has value of hardcoded id in non-protected VM
Test: atest virtualizationmanager_device_test
Bug: 291213394
Change-Id: I4ffa8a051532714bba091e7112e757e8b3b651fc
diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index 84c60bd..2c23441 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -118,7 +118,7 @@
pub gdb_port: Option<NonZeroU16>,
pub vfio_devices: Vec<VfioDevice>,
pub dtbo: Option<File>,
- pub reference_dt: Option<File>,
+ pub device_tree_overlay: Option<File>,
}
/// A disk image to pass to crosvm for a VM.
@@ -896,10 +896,8 @@
.arg("--socket")
.arg(add_preserved_fd(&mut preserved_fds, &control_server_socket.as_raw_descriptor()));
- if let Some(reference_dt) = &config.reference_dt {
- command
- .arg("--device-tree-overlay")
- .arg(add_preserved_fd(&mut preserved_fds, reference_dt));
+ if let Some(dt_overlay) = &config.device_tree_overlay {
+ command.arg("--device-tree-overlay").arg(add_preserved_fd(&mut preserved_fds, dt_overlay));
}
append_platform_devices(&mut command, &mut preserved_fds, &config)?;