Merge "crosvm merge: updated create_disk_file arguments" am: f5d5818706
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2115879
Change-Id: I2a2e6bdececcb017ac99a38d9f482d794f190d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/virtualizationservice/src/composite.rs b/virtualizationservice/src/composite.rs
index aee84cd..c9a68ac 100644
--- a/virtualizationservice/src/composite.rs
+++ b/virtualizationservice/src/composite.rs
@@ -121,7 +121,13 @@
/// This will work for raw, QCOW2, composite and Android sparse images.
fn get_partition_size(partition: &File, path: &Path) -> Result<u64, Error> {
// TODO: Use `context` once disk::Error implements std::error::Error.
- Ok(create_disk_file(partition.try_clone()?, MAX_NESTING_DEPTH, path)
- .map_err(|e| anyhow!("Failed to open partition image: {}", e))?
- .get_len()?)
+ // TODO: Add check for is_sparse_file
+ Ok(create_disk_file(
+ partition.try_clone()?,
+ /* is_sparse_file */ false,
+ MAX_NESTING_DEPTH,
+ path,
+ )
+ .map_err(|e| anyhow!("Failed to open partition image: {}", e))?
+ .get_len()?)
}