github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-08 12:54:05 +00:00
Code Issues Projects Releases Wiki Activity

dragonball: Fix clippy manual_inspect

Browse Source 
Manually fix `manual_inspect` clippy warning reported by rust 1.85.1.

```console
error: using `map_err` over `inspect_err`
   --> dbs_virtio_devices/src/net.rs:753:52
    |
753 |         self.device_info.read_config(offset, data).map_err(|e| {
    |                                                    ^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_inspect
    = note: `-D clippy::manual-inspect` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::manual_inspect)]`
help: try
    |
753 ~         self.device_info.read_config(offset, data).inspect_err(|e| {
754 ~             self.metrics.cfg_fails.inc();
    |
```

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
This commit is contained in:
Ruoqing He 2025-06-06 13:08:38 +00:00
parent 5e80293bfc
commit 16b45462a1
6 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dragonball/dbs_pci/src/vfio.rs
View File

@ -680,7 +680,7 @@ impl Region {
self.mmaps[i].mmap_host_addr = host_addr as u64;
self.mmaps[i].prot_flags = prot;
self.set_user_memory_region(i, true, vm).map_err(|e| {
self.set_user_memory_region(i, true, vm).inspect_err(|_| {
for j in 0..i {
match self.set_user_memory_region(j, false, vm) {
Ok(_) => {}
@ -702,7 +702,6 @@ impl Region {
);
}
}
e
})?;
// FIXME: add readonly flag into vfio_dma_map in future PR when it is needed.

5
src/dragonball/dbs_virtio_devices/src/balloon.rs
View File

@ -691,10 +691,7 @@ where
fn activate(&mut self, mut config: VirtioDeviceConfig<AS, Q, R>) -> ActivateResult {
self.device_info
.check_queue_sizes(&config.queues)
.map_err(|e| {
self.metrics.activate_fails.inc();
e
})?;
.inspect_err(|_| self.metrics.activate_fails.inc())?;
self.device_change_notifier = config.device_change_notifier.clone();
trace!(

6
src/dragonball/dbs_virtio_devices/src/block/handler.rs
View File

@ -248,11 +248,9 @@ impl<AS: DbsGuestAddressSpace, Q: QueueT> InnerBlockEpollHandler<AS, Q> {
return Ok(false);
}
req.check_capacity(disk_image, data_descs).map_err(|e| {
req.check_capacity(disk_image, data_descs).inspect_err(|_|
// It's caused by invalid request from guest, simple...
debug!("Failed to get buffer address for request");
e
})?;
debug!("Failed to get buffer address for request"))?;
for io in data_descs {
let host_addr = mem

10
src/dragonball/dbs_virtio_devices/src/block/request.rs
View File

@ -136,10 +136,7 @@ impl Request {
let mut desc = desc_chain
.next()
.ok_or(Error::DescriptorChainTooShort)
.map_err(|e| {
error!("virtio-blk: Request {:?} has only head descriptor", req);
e
})?;
.inspect_err(|_| error!("virtio-blk: Request {:?} has only head descriptor", req))?;
if !desc.has_next() {
status_desc = desc;
// Only flush requests are allowed to skip the data descriptor.
@ -157,10 +154,7 @@ impl Request {
desc = desc_chain
.next()
.ok_or(Error::DescriptorChainTooShort)
.map_err(|e| {
error!("virtio-blk: descriptor chain corrupted");
e
})?;
.inspect_err(|_| error!("virtio-blk: descriptor chain corrupted"))?;
}
status_desc = desc;
}

19
src/dragonball/dbs_virtio_devices/src/net.rs
View File

@ -750,19 +750,17 @@ where
fn read_config(&mut self, offset: u64, data: &mut [u8]) -> ConfigResult {
trace!(target: "virtio-net", "{}: VirtioDevice::read_config(0x{:x}, {:?})",
self.id, offset, data);
self.device_info.read_config(offset, data).map_err(|e| {
self.metrics.cfg_fails.inc();
e
})
self.device_info
.read_config(offset, data)
.inspect_err(|_| self.metrics.cfg_fails.inc())
}
fn write_config(&mut self, offset: u64, data: &[u8]) -> ConfigResult {
trace!(target: "virtio-net", "{}: VirtioDevice::write_config(0x{:x}, {:?})",
self.id, offset, data);
self.device_info.write_config(offset, data).map_err(|e| {
self.metrics.cfg_fails.inc();
e
})
self.device_info
.write_config(offset, data)
.inspect_err(|_| self.metrics.cfg_fails.inc())
}
fn activate(&mut self, mut config: VirtioDeviceConfig<AS, Q, R>) -> ActivateResult {
@ -775,10 +773,7 @@ where
self.device_info
.check_queue_sizes(&config.queues[..])
.map_err(|e| {
self.metrics.activate_fails.inc();
e
})?;
.inspect_err(|_| self.metrics.activate_fails.inc())?;
let tap = self.tap.take().ok_or_else(|| {
self.metrics.activate_fails.inc();
ActivateError::InvalidParam

19
src/dragonball/dbs_virtio_devices/src/vhost/vhost_kern/net.rs
View File

@ -485,19 +485,17 @@ where
fn read_config(&mut self, offset: u64, data: &mut [u8]) -> ConfigResult {
trace!(target: "vhost-net", "{}: Net::read_config(0x{:x}, {:?})",
self.id, offset, data);
self.device_info.read_config(offset, data).map_err(|e| {
self.metrics.cfg_fails.inc();
e
})
self.device_info
.read_config(offset, data)
.inspect_err(|_| self.metrics.cfg_fails.inc())
}
fn write_config(&mut self, offset: u64, data: &[u8]) -> ConfigResult {
trace!(target: "vhost-net", "{}: Net::write_config(0x{:x}, {:?})",
self.id, offset, data);
self.device_info.write_config(offset, data).map_err(|e| {
self.metrics.cfg_fails.inc();
e
})
self.device_info
.write_config(offset, data)
.inspect_err(|_| self.metrics.cfg_fails.inc())
}
fn activate(&mut self, config: crate::VirtioDeviceConfig<AS, Q, R>) -> crate::ActivateResult {
@ -512,10 +510,7 @@ where
self.device_info
.check_queue_sizes(&config.queues)
.map_err(|err| {
self.metrics.activate_fails.inc();
err
})?;
.inspect_err(|_| self.metrics.activate_fails.inc())?;
if let Err(err) = self.do_device_activate(&config, vq_pairs) {
error!(target: "vhost-net", "device {:?} activate failed: {:?}", self.id, err);