Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-27 11:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the vars mechanism in OSDK and polish documents

Browse Source
This commit is contained in:
Zhang Junyang
2024-04-25 00:47:52 +08:00
committed by Tate, Hongliang Tian
parent 56175f63df
commit cc4111cab2
13 changed files with 149 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osdk/src/config/scheme/qemu.rs
View File

@ -6,10 +6,7 @@ use std::{path::PathBuf, process};
use crate::{
arch::{get_default_arch, Arch},
config::{
eval::{eval, Vars},
unix_args::{apply_kv_array, get_key, split_to_kv_array},
},
config::unix_args::{apply_kv_array, get_key, split_to_kv_array},
error::Errno,
error_msg,
};
@ -55,26 +52,17 @@ impl Qemu {
impl QemuScheme {
pub fn inherit(&mut self, from: &Self) {
if from.args.is_some() {
if self.args.is_none() {
self.args = from.args.clone();
}
if from.path.is_some() {
if self.path.is_none() {
self.path = from.path.clone();
}
}
pub fn finalize(self, vars: &Vars, arch: Arch) -> Qemu {
pub fn finalize(self, arch: Arch) -> Qemu {
Qemu {
args: self
.args
.map(|args| match eval(vars, &args) {
Ok(v) => v,
Err(e) => {
error_msg!("Failed to evaluate qemu args: {:#?}", e);
process::exit(Errno::ParseMetadata as _);
}
})
.unwrap_or_default(),
args: self.args.unwrap_or_default(),
path: self.path.unwrap_or(PathBuf::from(arch.system_qemu())),
}
}