github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 06:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8932 from kalil-pelissier/feature/issue-8586/fix-noop-method-call-warning

Browse Source 
dragonball: fix noop-method-call warning
This commit is contained in:
Xuewei Niu
2024-01-31 19:24:27 +08:00
committed by GitHub
parent bf54a02e16 3fd5628771
commit 5449173102
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ impl<AS: DbsGuestAddressSpace, Q: QueueT> InnerBlockEpollHandler<AS, Q> {
data_descs, data_descs,
iovecs, iovecs,
&mut self.disk_image, &mut self.disk_image,
mem.deref(), mem,
) { ) {
Ok(submited) => { Ok(submited) => {
if submited { if submited {
@@ -104,7 +104,7 @@ impl<AS: DbsGuestAddressSpace, Q: QueueT> InnerBlockEpollHandler<AS, Q> {
// Else not Submited, fallback to synchronous processing // Else not Submited, fallback to synchronous processing
} }
Err(_e) => { Err(_e) => {
req.update_status(mem.deref(), VIRTIO_BLK_S_IOERR); req.update_status(mem, VIRTIO_BLK_S_IOERR);
used_desc_vec.push((index, 0)); used_desc_vec.push((index, 0));
continue 'next_desc; continue 'next_desc;
} }
@@ -118,7 +118,7 @@ impl<AS: DbsGuestAddressSpace, Q: QueueT> InnerBlockEpollHandler<AS, Q> {
&data_descs[..], &data_descs[..],
&mut self.disk_image, &mut self.disk_image,
&self.disk_image_id, &self.disk_image_id,
mem.deref(), mem,
) { ) {
Ok(num_bytes_to_mem) => { Ok(num_bytes_to_mem) => {
used_desc_vec.push((index, num_bytes_to_mem)); used_desc_vec.push((index, num_bytes_to_mem));
@@ -180,9 +180,9 @@ impl<AS: DbsGuestAddressSpace, Q: QueueT> InnerBlockEpollHandler<AS, Q> {
disk_image_id: &[u8], disk_image_id: &[u8],
mem: &M, mem: &M,
) -> std::result::Result<u32, ExecuteError> { ) -> std::result::Result<u32, ExecuteError> {
match req.execute(disk_image, mem.deref(), data_descs, disk_image_id) { match req.execute(disk_image, mem, data_descs, disk_image_id) {
Ok(l) => { Ok(l) => {
req.update_status(mem.deref(), VIRTIO_BLK_S_OK); req.update_status(mem, VIRTIO_BLK_S_OK);
Ok(l) Ok(l)
} }
Err(e) => { Err(e) => {
@@ -229,7 +229,7 @@ impl<AS: DbsGuestAddressSpace, Q: QueueT> InnerBlockEpollHandler<AS, Q> {
} }
}; };
req.update_status(mem.deref(), err_code); req.update_status(mem, err_code);
Err(e) Err(e)
} }
} }