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: Switch factory to QcowDisk

Browse Source 
Update open_qcow2 to construct QcowDisk instead of choosing
between QcowDiskAsync and QcowDiskSync. The backend decision
is now made inside QcowDisk::create_async_io.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
This commit is contained in:
Anatol Belski
2026-04-24 10:24:05 +02:00
committed by Rob Bradford
parent 65c98ca157
commit 1e4516fa5d
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
block/src/factory.rs
View File

@@ -21,9 +21,7 @@ use crate::block_io_uring_is_supported;
use crate::disk_file::AsyncFullDiskFile; use crate::disk_file::AsyncFullDiskFile;
use crate::error::{BlockError, BlockErrorKind, BlockResult}; use crate::error::{BlockError, BlockErrorKind, BlockResult};
use crate::fixed_vhd_disk::FixedVhdDisk; use crate::fixed_vhd_disk::FixedVhdDisk;
#[cfg(feature = "io_uring")] use crate::qcow_disk::QcowDisk;
use crate::qcow_async::QcowDiskAsync;
use crate::qcow_sync::QcowDiskSync;
use crate::raw_disk::{RawBackend, RawDisk}; use crate::raw_disk::{RawBackend, RawDisk};
use crate::vhdx_sync::VhdxDiskSync; use crate::vhdx_sync::VhdxDiskSync;
use crate::{ use crate::{
@@ -179,8 +177,14 @@ fn open_qcow2(
if io_uring_supported() { if io_uring_supported() {
info!("Opening QCOW2 disk file with io_uring backend"); info!("Opening QCOW2 disk file with io_uring backend");
return Ok(Box::new( return Ok(Box::new(
QcowDiskAsync::new(file, options.direct, options.backing_files, options.sparse) QcowDisk::new(
.map_err(|e| e.with_path(options.path))?, file,
options.direct,
options.backing_files,
options.sparse,
true,
)
.map_err(|e| e.with_path(options.path))?,
)); ));
} }
info!("io_uring runtime probe failed for QCOW2, using synchronous backend"); info!("io_uring runtime probe failed for QCOW2, using synchronous backend");
@@ -188,8 +192,14 @@ fn open_qcow2(
info!("Opening QCOW2 disk file with synchronous backend"); info!("Opening QCOW2 disk file with synchronous backend");
Ok(Box::new( Ok(Box::new(
QcowDiskSync::new(file, options.direct, options.backing_files, options.sparse) QcowDisk::new(
.map_err(|e| e.with_path(options.path))?, file,
options.direct,
options.backing_files,
options.sparse,
false,
)
.map_err(|e| e.with_path(options.path))?,
)) ))
} }