libavf: implement setHypervisorSpecificAuthMethod for Gunyah
Bug: 381971305
Bug: 380912007
Test: m
Change-Id: Ic997b73f5cad00d4b93a1aff64ee3d24aebf2c6f
diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 0cde751..c71b5c5 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -588,8 +588,11 @@
check_gdb_allowed(config)?;
}
+ let instance_id = extract_instance_id(config);
let mut device_tree_overlays = vec![];
- if let Some(dt_overlay) = maybe_create_reference_dt_overlay(config, &temporary_directory)? {
+ if let Some(dt_overlay) =
+ maybe_create_reference_dt_overlay(config, &instance_id, &temporary_directory)?
+ {
device_tree_overlays.push(dt_overlay);
}
if let Some(dtbo) = get_dtbo(config) {
@@ -860,6 +863,8 @@
balloon: config.balloon,
usb_config,
dump_dt_fd,
+ enable_hypervisor_specific_auth_method: config.enableHypervisorSpecificAuthMethod,
+ instance_id,
};
let instance = Arc::new(
VmInstance::new(
@@ -947,6 +952,7 @@
fn maybe_create_reference_dt_overlay(
config: &VirtualMachineConfig,
+ instance_id: &[u8; 64],
temporary_directory: &Path,
) -> binder::Result<Option<File>> {
// Currently, VirtMgr adds the host copy of reference DT & untrusted properties
@@ -975,11 +981,9 @@
vec![]
};
- let instance_id;
let key_material;
let mut untrusted_props = Vec::with_capacity(2);
if cfg!(llpvm_changes) {
- instance_id = extract_instance_id(config);
untrusted_props.push((cstr!("instance-id"), &instance_id[..]));
let want_updatable = extract_want_updatable(config);
if want_updatable && is_secretkeeper_supported() {