commit 6f0de0b8be945ce6d708fea2acf7746b81a10e55
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 25 02:19:10 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 25 02:19:10 2024 +0000
tree 3a294662c5203f07ea1935a5599f17ad87e5a1d8
parent 2bad406df50b5d6a24eb8681f56d095bb220015f
parent 19be96fec09582e08e42f8f49f83afca66f67ca5

Merge "Link to loopXpY symbolically" into main

android/virtmgr/src/aidl.rs

diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 9d985ad..87fb611 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -1105,9 +1105,7 @@
 
         if let Some(file) = custom_config.vendorImage.as_ref() {
             add_microdroid_vendor_image(clone_file(file)?, &mut vm_config);
-            if !cfg!(tpu_assignable_device) {
-                append_kernel_param("androidboot.microdroid.mount_vendor=1", &mut vm_config);
-            }
+            append_kernel_param("androidboot.microdroid.mount_vendor=1", &mut vm_config)
         }
 
         vm_config.devices.clone_from(&custom_config.devices);

android/virtmgr/src/dt_overlay.rs

diff --git a/android/virtmgr/src/dt_overlay.rs b/android/virtmgr/src/dt_overlay.rs
index d226635..108ed61 100644
--- a/android/virtmgr/src/dt_overlay.rs
+++ b/android/virtmgr/src/dt_overlay.rs
@@ -17,7 +17,7 @@
 use anyhow::{anyhow, Result};
 use cstr::cstr;
 use fsfdt::FsFdt;
-use libfdt::{Fdt, FdtError};
+use libfdt::Fdt;
 use std::ffi::CStr;
 use std::path::Path;
 
@@ -90,26 +90,7 @@
         fdt.overlay_onto(cstr!("/fragment@0/__overlay__"), path)?;
     }
 
-    if cfg!(tpu_assignable_device) {
-        let mut avf = fdt
-            .node_mut(cstr!("/fragment@0/__overlay__/avf"))
-            .map_err(|e| anyhow!("Failed to search avf node: {e:?}"))?
-            .ok_or(anyhow!("Failed to get avf node"))?;
-        let vendor_digest = cstr!("vendor_hashtree_descriptor_root_digest");
-        // Remove the vendor digest.
-        // In the case it is actually requested, it will be re-added by virtue of being in
-        // `trusted_props`.
-        match avf.delprop(vendor_digest) {
-            Ok(()) | Err(FdtError::NotFound) => {}
-            Err(e) => {
-                return Err(anyhow!("Unexpected error pre-removing {vendor_digest:?}: {e:?}"))
-            }
-        }
-        for (name, value) in trusted_props {
-            avf.setprop(name, value)
-                .map_err(|e| anyhow!("Failed to set trusted property: {e:?}"))?;
-        }
-    } else if !trusted_props.is_empty() {
+    if !trusted_props.is_empty() {
         let mut avf = fdt
             .node_mut(cstr!("/fragment@0/__overlay__/avf"))
             .map_err(|e| anyhow!("Failed to search avf node: {e:?}"))?

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index 59717b8..6ab1d89 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -50,9 +50,6 @@
     }) + select(release_flag("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"), {
         true: ["paravirtualized_devices"],
         default: [],
-    }) + select(release_flag("RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"), {
-        true: ["tpu_assignable_device"],
-        default: [],
     }),
 }
 
@@ -67,9 +64,6 @@
     }) + select(release_flag("RELEASE_AVF_ENABLE_VIRT_CPUFREQ"), {
         true: ["-DAVF_ENABLE_VIRT_CPUFREQ=1"],
         default: [],
-    }) + select(release_flag("RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"), {
-        true: ["-DAVF_ENABLE_TPU_ASSIGNABLE_DEVICE=1"],
-        default: [],
     }),
 }
 

libs/libavf_cc_flags/include/android/avf_cc_flags.h

diff --git a/libs/libavf_cc_flags/include/android/avf_cc_flags.h b/libs/libavf_cc_flags/include/android/avf_cc_flags.h
index 9fcd542..c922266 100644
--- a/libs/libavf_cc_flags/include/android/avf_cc_flags.h
+++ b/libs/libavf_cc_flags/include/android/avf_cc_flags.h
@@ -35,13 +35,5 @@
 #endif
 }
 
-inline bool IsEnableTpuAssignableDeviceFlagEnabled() {
-#ifdef AVF_ENABLE_TPU_ASSIGNABLE_DEVICE
-    return AVF_ENABLE_TPU_ASSIGNABLE_DEVICE;
-#else
-    return false;
-#endif
-}
-
 } // namespace virtualization
 } // namespace android