vmconfig: remove path (use paths always)
Fixes: 190503456
Test: MicrodroidHostTestCases
Change-Id: I083eaacf5057337334467713ab3f8d12813491e2
diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index 19a6d9f..aaf43e4 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -102,8 +102,7 @@
// put metadata at the first partition
let mut partitions = vec![Partition {
label: String::from("metadata"),
- path: Some(metadata_path),
- paths: vec![],
+ paths: vec![metadata_path],
writable: false,
}];
@@ -117,9 +116,9 @@
if make_filler(size, &filler_path)? {
filler_count += 1;
- Ok(Partition { label, path: None, paths: vec![path, filler_path], writable: false })
+ Ok(Partition { label, paths: vec![path, filler_path], writable: false })
} else {
- Ok(Partition { label, path: Some(path), paths: vec![], writable: false })
+ Ok(Partition { label, paths: vec![path], writable: false })
}
};
for (i, apex) in apexes.iter().enumerate() {