kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: qcow: Migrate convert() to BlockResult

Browse Source 
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 <anbelski@linux.microsoft.com>
This commit is contained in:
Anatol Belski
2026-03-09 23:22:38 +01:00
committed by Rob Bradford
parent 4930d93090
commit 1accf47db4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
block/src/qcow/mod.rs
View File

@@ -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)))
}
}
}