From 1accf47db4510ae9345b62b83b0d229fb9b5f2d0 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 9 Mar 2026 23:22:38 +0100 Subject: [PATCH] block: qcow: Migrate convert() to BlockResult Switch the public convert() entry point to BlockResult. Inner calls to functions already returning BlockResult propagate naturally; those still returning qcow::Error get map_err bridges. Signed-off-by: Anatol Belski --- block/src/qcow/mod.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/src/qcow/mod.rs b/block/src/qcow/mod.rs index 974e6ec41..a5714badd 100644 --- a/block/src/qcow/mod.rs +++ b/block/src/qcow/mod.rs @@ -2142,20 +2142,20 @@ pub fn convert( dst_file: RawFile, dst_type: ImageType, src_max_nesting_depth: u32, -) -> Result<()> { - let src_type = detect_image_type(&mut src_file)?; +) -> BlockResult<()> { + let src_type = + detect_image_type(&mut src_file).map_err(|e| BlockError::new(BlockErrorKind::Io, e))?; match src_type { ImageType::Qcow2 => { let mut src_reader = - QcowFile::from_with_nesting_depth(src_file, src_max_nesting_depth, true)?; + QcowFile::from_with_nesting_depth(src_file, src_max_nesting_depth, true) + .map_err(|e| BlockError::new(BlockErrorKind::Io, e))?; convert_reader(&mut src_reader, dst_file, dst_type) - .map_err(|e| Error::ReadingData(io::Error::other(e))) } ImageType::Raw => { // src_file is a raw file. let mut src_reader = src_file; convert_reader(&mut src_reader, dst_file, dst_type) - .map_err(|e| Error::ReadingData(io::Error::other(e))) } } }