Merge "Revert "Adding parameter for trusty_security_vm_launcher vCPU configuration"" into main
diff --git a/guest/trusty/security_vm/launcher/src/main.rs b/guest/trusty/security_vm/launcher/src/main.rs
index 4298181..bdb4ed8 100644
--- a/guest/trusty/security_vm/launcher/src/main.rs
+++ b/guest/trusty/security_vm/launcher/src/main.rs
@@ -15,8 +15,8 @@
//! A client for trusty security VMs during early boot.
use android_system_virtualizationservice::aidl::android::system::virtualizationservice::{
- CpuTopology::CpuTopology, IVirtualizationService::IVirtualizationService,
- VirtualMachineConfig::VirtualMachineConfig, VirtualMachineRawConfig::VirtualMachineRawConfig,
+ IVirtualizationService::IVirtualizationService, VirtualMachineConfig::VirtualMachineConfig,
+ VirtualMachineRawConfig::VirtualMachineRawConfig,
};
use android_system_virtualizationservice::binder::{ParcelFileDescriptor, Strong};
use anyhow::{Context, Result};
@@ -26,8 +26,7 @@
use vmclient::VmInstance;
#[derive(Parser)]
-/// Collection of CLI for trusty_security_vm_launcher
-pub struct Args {
+struct Args {
/// Path to the trusty kernel image.
#[arg(long)]
kernel: PathBuf,
@@ -43,10 +42,6 @@
/// Memory size of the VM in MiB
#[arg(long, default_value_t = 128)]
memory_size_mib: i32,
-
- /// CPU Topology exposed to the VM <one-cpu|match_host>
- #[arg(long, default_value = "one_cpu", value_parser = parse_cpu_topology)]
- cpu_topology: CpuTopology,
}
fn get_service() -> Result<Strong<dyn IVirtualizationService>> {
@@ -55,14 +50,6 @@
virtmgr.connect().context("Failed to connect to VirtualizationService")
}
-fn parse_cpu_topology(s: &str) -> Result<CpuTopology, String> {
- match s {
- "one-cpu" => Ok(CpuTopology::ONE_CPU),
- "match-host" => Ok(CpuTopology::MATCH_HOST),
- _ => Err(format!("Invalid cpu topology {}", s)),
- }
-}
-
fn main() -> Result<()> {
let args = Args::parse();
@@ -76,7 +63,6 @@
kernel: Some(ParcelFileDescriptor::new(kernel)),
protectedVm: args.protected,
memoryMib: args.memory_size_mib,
- cpuTopology: args.cpu_topology,
platformVersion: "~1.0".to_owned(),
// TODO: add instanceId
..Default::default()