Initial work to make VM config file optional
Modify VirtualMachineAppConfig to allow configPath to be omitted;
instead a subset of the available config options can be specified
directly.
Modify VS to map the config options to the Metadata proto file.
At this stage nothing ever sets the payload config directly, and
Microdroid would reject it if it received it, but this at least
establishes the plumbing.
Bug: 243513572
Test: atest MicrodroidTests
Change-Id: I596384abf6e3bbbccd8934ba28fa3a85faa51b56
diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index 06b9716..3efd7ac 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -15,14 +15,16 @@
//! Payload disk image
use android_system_virtualizationservice::aidl::android::system::virtualizationservice::{
- DiskImage::DiskImage, Partition::Partition, VirtualMachineAppConfig::DebugLevel::DebugLevel,
- VirtualMachineAppConfig::VirtualMachineAppConfig,
+ DiskImage::DiskImage,
+ Partition::Partition,
+ VirtualMachineAppConfig::DebugLevel::DebugLevel,
+ VirtualMachineAppConfig::{Payload::Payload, VirtualMachineAppConfig},
VirtualMachineRawConfig::VirtualMachineRawConfig,
};
use anyhow::{anyhow, bail, Context, Result};
use binder::{wait_for_interface, ParcelFileDescriptor};
use log::{info, warn};
-use microdroid_metadata::{ApexPayload, ApkPayload, Metadata};
+use microdroid_metadata::{ApexPayload, ApkPayload, Metadata, PayloadConfig, PayloadMetadata};
use microdroid_payload_config::{ApexConfig, VmPayloadConfig};
use once_cell::sync::OnceCell;
use packagemanager_aidl::aidl::android::content::pm::IPackageManagerNative::IPackageManagerNative;
@@ -156,11 +158,22 @@
}
fn make_metadata_file(
- config_path: &str,
+ app_config: &VirtualMachineAppConfig,
apex_infos: &[&ApexInfo],
temporary_directory: &Path,
) -> Result<ParcelFileDescriptor> {
- let metadata_path = temporary_directory.join("metadata");
+ let payload_metadata = match &app_config.payload {
+ Payload::PayloadConfig(payload_config) => PayloadMetadata::config(PayloadConfig {
+ payload_binary_path: payload_config.payloadPath.clone(),
+ export_tombstones: payload_config.exportTombstones,
+ args: payload_config.args.clone().into(),
+ ..Default::default()
+ }),
+ Payload::ConfigPath(config_path) => {
+ PayloadMetadata::config_path(format!("/mnt/apk/{}", config_path))
+ }
+ };
+
let metadata = Metadata {
version: 1,
apexes: apex_infos
@@ -183,11 +196,12 @@
..Default::default()
})
.into(),
- payload_config_path: format!("/mnt/apk/{}", config_path),
+ payload: Some(payload_metadata),
..Default::default()
};
// Write metadata to file.
+ let metadata_path = temporary_directory.join("metadata");
let mut metadata_file = OpenOptions::new()
.create_new(true)
.read(true)
@@ -235,8 +249,7 @@
collect_apex_infos(&apex_list, &vm_payload_config.apexes, app_config.debugLevel);
info!("Microdroid payload APEXes: {:?}", apex_infos.iter().map(|ai| &ai.name));
- let metadata_file =
- make_metadata_file(&app_config.configPath, &apex_infos, temporary_directory)?;
+ let metadata_file = make_metadata_file(app_config, &apex_infos, temporary_directory)?;
// put metadata at the first partition
let mut partitions = vec![Partition {
label: "payload-metadata".to_owned(),