qiurui
/
asterinas
mirror of https://github.com/asterinas/asterinas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support QOM format when parsing QEMU arguments

This commit is contained in:
Tao Su 2026-01-04 14:51:54 +00:00 committed by Tate, Hongliang Tian
parent 413f459e20
commit 284e193823
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osdk/src/config/unix_args.rs
View File

@ -28,7 +28,7 @@ pub fn split_to_kv_array(args: &str) -> Vec<String> {
&& let Some(last) = joined.last_mut() && let Some(last) = joined.last_mut()
{ {
last.push(' '); last.push(' ');
last.push_str(&elem); last.push_str(&shlex::Quoter::new().quote(elem.as_str()).unwrap());
last_has_value = true; last_has_value = true;
continue; continue;
} }
@ -130,20 +130,8 @@ fn infer_multi_value_keys(array: &Vec<String>, separator: &str) -> IndexSet<Stri
} }
pub fn get_key(item: &str, separator: &str) -> Option<String> { pub fn get_key(item: &str, separator: &str) -> Option<String> {
let split = item.split(separator).collect::<Vec<_>>(); item.split_once(separator)
let len = split.len(); .map(|(key, _value)| key.to_string())
if len > 2 || len == 0 {
error_msg!("`{}` is an invalid argument.", item);
process::exit(Errno::ParseMetadata as _);
}
if len == 1 {
return None;
}
let key = split.first().unwrap();
Some(key.to_string())
} }
#[cfg(test)] #[cfg(test)]
@ -194,4 +182,18 @@ pub mod test {
let expected: Vec<_> = expected.iter().map(ToString::to_string).collect(); let expected: Vec<_> = expected.iter().map(ToString::to_string).collect();
assert_eq!(expected, array); assert_eq!(expected, array);
} }
#[test]
fn test_split_kv_array() {
let args = "-enable-kvm -object '{ \"qom-type\": \"tdx-guest\", \"id\": \"tdx0\", \"sept-ve-disable\": true, \"quote-generation-socket\": { \"type\": \"vsock\", \"cid\": \"2\", \"port\": \"4050\" } }'";
let expected = &[
"-enable-kvm",
"-object '{ \"qom-type\": \"tdx-guest\", \"id\": \"tdx0\", \"sept-ve-disable\": true, \"quote-generation-socket\": { \"type\": \"vsock\", \"cid\": \"2\", \"port\": \"4050\" } }'",
];
let array = split_to_kv_array(args);
let expected: Vec<_> = expected.iter().map(ToString::to_string).collect();
assert_eq!(expected, array);
}
} }