Merge changes I801ff6fd,I3a008c4b into main
* changes:
Support MicrodroidBenchmark to test boot time with custom vendor image
Support amending vendor hashtree digest when virtmgr constructs DTBO based on host DT
diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index a8a176a..abaa74c 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -62,8 +62,6 @@
pub debug_mode: bool,
/// CPU topology of the VM. Defaults to 1 vCPU.
pub cpu_topology: VmCpuTopology,
- /// List of task profiles to apply to the VM
- pub task_profiles: Vec<String>,
/// If present, overrides the amount of RAM to give the VM
pub memory_mib: Option<i32>,
/// Whether the VM prefers staged APEXes or activated ones (false; default)
@@ -131,10 +129,7 @@
protectedVm: protected_vm,
memoryMib: parameters.memory_mib.unwrap_or(0), // 0 means use the default
cpuTopology: cpu_topology,
- customConfig: Some(CustomConfig {
- taskProfiles: parameters.task_profiles.clone(),
- ..Default::default()
- }),
+ customConfig: Some(CustomConfig { ..Default::default() }),
});
// Let logs go to logcat.
@@ -144,7 +139,7 @@
service,
&config,
console_fd,
- /*console_in_fd */ None,
+ /* console_in_fd */ None,
log_fd,
Some(callback),
)
diff --git a/compos/composd/src/instance_manager.rs b/compos/composd/src/instance_manager.rs
index 510ad11..9e94035 100644
--- a/compos/composd/src/instance_manager.rs
+++ b/compos/composd/src/instance_manager.rs
@@ -82,9 +82,8 @@
// a system property. Start the VM with all CPUs and assume the guest will start a suitable
// number of dex2oat threads.
let cpu_topology = VmCpuTopology::MatchHost;
- let task_profiles = vec!["SCHED_SP_COMPUTE".to_string()];
let memory_mib = Some(compos_memory_mib()?);
- Ok(VmParameters { cpu_topology, task_profiles, memory_mib, ..Default::default() })
+ Ok(VmParameters { cpu_topology, memory_mib, ..Default::default() })
}
fn compos_memory_mib() -> Result<i32> {
diff --git a/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java b/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java
index 144989e..693a7d7 100644
--- a/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java
+++ b/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java
@@ -588,7 +588,6 @@
if (mVendorDiskImage != null) {
VirtualMachineAppConfig.CustomConfig customConfig =
new VirtualMachineAppConfig.CustomConfig();
- customConfig.taskProfiles = EMPTY_STRING_ARRAY;
customConfig.devices = EMPTY_STRING_ARRAY;
try {
customConfig.vendorImage =
diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index c32960b..0655e5f 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -562,7 +562,6 @@
memory_mib: config.memoryMib.try_into().ok().and_then(NonZeroU32::new),
cpus,
host_cpu_topology,
- task_profiles: config.taskProfiles.clone(),
console_out_fd,
console_in_fd,
log_fd,
@@ -820,7 +819,6 @@
if let Some(file) = custom_config.customKernelImage.as_ref() {
vm_config.kernel = Some(ParcelFileDescriptor::new(clone_file(file)?))
}
- vm_config.taskProfiles = custom_config.taskProfiles.clone();
vm_config.gdbPort = custom_config.gdbPort;
if let Some(file) = custom_config.vendorImage.as_ref() {
diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index 3380df3..ddd3e68 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -107,7 +107,6 @@
pub memory_mib: Option<NonZeroU32>,
pub cpus: Option<NonZeroU32>,
pub host_cpu_topology: bool,
- pub task_profiles: Vec<String>,
pub console_out_fd: Option<File>,
pub console_in_fd: Option<File>,
pub log_fd: Option<File>,
@@ -824,10 +823,6 @@
}
}
- if !config.task_profiles.is_empty() {
- command.arg("--task-profiles").arg(config.task_profiles.join(","));
- }
-
if let Some(gdb_port) = config.gdb_port {
command.arg("--gdb").arg(gdb_port.to_string());
}
diff --git a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl
index 9021055..8302a2f 100644
--- a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl
+++ b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineAppConfig.aidl
@@ -101,11 +101,6 @@
*/
int gdbPort = 0;
- /**
- * List of task profile names to apply for the VM
- */
- String[] taskProfiles;
-
/** A disk image containing vendor specific modules. */
@nullable ParcelFileDescriptor vendorImage;
diff --git a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl
index 7c0ed0c..6be2833 100644
--- a/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl
+++ b/virtualizationservice/aidl/android/system/virtualizationservice/VirtualMachineRawConfig.aidl
@@ -60,11 +60,6 @@
@utf8InCpp String platformVersion;
/**
- * List of task profile names to apply for the VM
- */
- String[] taskProfiles;
-
- /**
* Port at which crosvm will start a gdb server to debug guest kernel.
* If set to zero, then gdb server won't be started.
*/
diff --git a/virtualizationservice/src/atom.rs b/virtualizationservice/src/atom.rs
index 862646b..6e0064f 100644
--- a/virtualizationservice/src/atom.rs
+++ b/virtualizationservice/src/atom.rs
@@ -47,7 +47,6 @@
cpu_affinity: "", // deprecated
memory_mib: atom.memoryMib,
apexes: &atom.apexes,
- // TODO(seungjaeyoo) Fill information about task_profile
// TODO(seungjaeyoo) Fill information about disk_image for raw config
};
diff --git a/vm/src/main.rs b/vm/src/main.rs
index ea8c682..355e193 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -45,10 +45,6 @@
#[arg(long, default_value = "one_cpu", value_parser = parse_cpu_topology)]
cpu_topology: CpuTopology,
- /// Comma separated list of task profile names to apply to the VM
- #[arg(long)]
- task_profiles: Vec<String>,
-
/// Memory size (in MiB) of the VM. If unspecified, defaults to the value of `memory_mib`
/// in the VM config file.
#[arg(short, long)]
diff --git a/vm/src/run.rs b/vm/src/run.rs
index 1d2f48b..5a4a459 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -136,7 +136,6 @@
let custom_config = CustomConfig {
customKernelImage: None,
gdbPort: config.debug.gdb.map(u16::from).unwrap_or(0) as i32, // 0 means no gdb
- taskProfiles: config.common.task_profiles,
vendorImage: vendor,
devices: config
.microdroid
@@ -235,7 +234,6 @@
vm_config.gdbPort = gdb.get() as i32;
}
vm_config.cpuTopology = config.common.cpu_topology;
- vm_config.taskProfiles = config.common.task_profiles;
run(
get_service()?.as_ref(),
&VirtualMachineConfig::RawConfig(vm_config),