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

misc: clippy: add map_unwrap_or

Browse Source 
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
This commit is contained in:
Philipp Schuster
2025-11-18 12:28:43 +01:00
committed by Rob Bradford
parent dda89d7027
commit d2b19bb969
8 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
virtio-devices/src/block.rs
View File

@@ -735,9 +735,7 @@ impl Block {
(disk_nsectors, avail_features, 0, config, false)
};
let serial = serial
.map(Vec::from)
.unwrap_or_else(|| build_serial(&disk_path));
let serial = serial.map_or_else(|| build_serial(&disk_path), Vec::from);
Ok(Block {
common: VirtioCommon {
@@ -773,21 +771,20 @@ impl Block {
// TODO In future, we could add a `lock_granularity=` configuration to the CLI.
// For now, we stick to QEMU behavior.
fn lock_granularity(&mut self) -> LockGranularity {
let fallback = LockGranularity::WholeFile;
self.disk_image
.size()
.map(|size| LockGranularity::ByteRange(0, size))
self.disk_image.size().map_or_else(
// use a safe fallback
.unwrap_or_else(|e| {
log::warn!(
|e| {
let fallback = LockGranularity::WholeFile;
warn!(
"Can't get disk size for id={},path={}, falling back to {:?}: error: {e}",
self.id,
self.disk_path.display(),
fallback
);
fallback
})
},
|size| LockGranularity::ByteRange(0, size),
)
}
/// Tries to set an advisory lock for the corresponding disk image.