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

virtio-devices: vmm: fuzz: Switch to DiskBackend

Browse Source 
Change Block to hold DiskBackend instead of
Box<dyn async_io::DiskFile>. In device_manager, existing formats
(raw, vhd, vhdx) are wrapped in DiskBackend::Legacy while
QcowDiskSync uses DiskBackend::Next. The fuzz target is updated
accordingly.

The Error::DiskResize variant now carries BlockError instead of
DiskFileError, matching the BlockResult return type of
DiskBackend::resize().

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
This commit is contained in:
Anatol Belski
2026-03-12 23:51:58 +01:00
committed by Rob Bradford
parent 264013b424
commit b4dad66d35
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vmm/src/device_manager.rs
View File

@@ -33,6 +33,7 @@ use arch::layout::{APIC_START, IOAPIC_SIZE, IOAPIC_START};
use arch::{DeviceType, MmioDeviceInfo};
use arch::{NumaNodes, layout};
use block::async_io::DiskFile;
use block::disk_file::DiskBackend;
use block::error::BlockError;
use block::fixed_vhd_sync::FixedVhdDiskSync;
use block::qcow_sync::QcowDiskSync;
@@ -2721,17 +2722,17 @@ impl DeviceManager {
unreachable!("Checked in if statement above");
#[cfg(feature = "io_uring")]
{
Box::new(
DiskBackend::Legacy(Box::new(
FixedVhdDiskAsync::new(file)
.map_err(DeviceManagerError::CreateFixedVhdDiskAsync)?,
) as Box<dyn DiskFile>
) as Box<dyn DiskFile>)
}
} else {
info!("Using synchronous fixed VHD disk file");
Box::new(
DiskBackend::Legacy(Box::new(
FixedVhdDiskSync::new(file)
.map_err(DeviceManagerError::CreateFixedVhdDiskSync)?,
) as Box<dyn DiskFile>
) as Box<dyn DiskFile>)
}
}
ImageType::Raw => {
@@ -2755,19 +2756,23 @@ impl DeviceManager {
unreachable!("Checked in if statement above");
#[cfg(feature = "io_uring")]
{
Box::new(RawFileDisk::new(file)) as Box<dyn DiskFile>
DiskBackend::Legacy(
Box::new(RawFileDisk::new(file)) as Box<dyn DiskFile>
)
}
} else if !disk_cfg.disable_aio && self.aio_is_supported() {
info!("Using asynchronous RAW disk file (aio)");
Box::new(RawFileDiskAio::new(file)) as Box<dyn DiskFile>
DiskBackend::Legacy(Box::new(RawFileDiskAio::new(file)) as Box<dyn DiskFile>)
} else {
info!("Using synchronous RAW disk file");
Box::new(RawFileDiskSync::new(file)) as Box<dyn DiskFile>
DiskBackend::Legacy(
Box::new(RawFileDiskSync::new(file)) as Box<dyn DiskFile>
)
}
}
ImageType::Qcow2 => {
info!("Using synchronous QCOW2 disk file");
Box::new(
DiskBackend::Next(Box::new(
QcowDiskSync::new(
file,
disk_cfg.direct,
@@ -2779,14 +2784,14 @@ impl DeviceManager {
None => e,
})
.map_err(DeviceManagerError::CreateQcowDiskSync)?,
) as Box<dyn DiskFile>
))
}
ImageType::Vhdx => {
info!("Using synchronous VHDX disk file");
Box::new(
DiskBackend::Legacy(Box::new(
VhdxDiskSync::new(file)
.map_err(DeviceManagerError::CreateFixedVhdxDiskSync)?,
) as Box<dyn DiskFile>
) as Box<dyn DiskFile>)
}
ImageType::Unknown => unreachable!(),
};