From 0d3c5c966b1db2a38f91a1c379924588f5e744a9 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 7 May 2021 10:15:08 +0000 Subject: [PATCH] virtio-devices: mem: Address clippy issue error: all if blocks contain the same code at the start --> virtio-devices/src/mem.rs:508:9 | 508 | / if plug { 509 | | let handlers = self.dma_mapping_handlers.lock().unwrap(); | |_____________________________________________________________________^ | = note: `-D clippy::branches-sharing-code` implied by `-D warnings` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#branches_sharing_code help: consider moving the start statements out like this | 508 | let handlers = self.dma_mapping_handlers.lock().unwrap(); 509 | if plug { | Signed-off-by: Rob Bradford --- virtio-devices/src/mem.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/virtio-devices/src/mem.rs b/virtio-devices/src/mem.rs index 01fe3b249..4d90d27f9 100644 --- a/virtio-devices/src/mem.rs +++ b/virtio-devices/src/mem.rs @@ -505,8 +505,8 @@ impl MemEpollHandler { .unwrap() .set_range(first_block_index, nb_blocks, plug); + let handlers = self.dma_mapping_handlers.lock().unwrap(); if plug { - let handlers = self.dma_mapping_handlers.lock().unwrap(); let mut gpa = addr; for _ in 0..nb_blocks { for (_, handler) in handlers.iter() { @@ -524,7 +524,6 @@ impl MemEpollHandler { config.plugged_size += size; } else { - let handlers = self.dma_mapping_handlers.lock().unwrap(); for (_, handler) in handlers.iter() { if let Err(e) = handler.unmap(addr, size) { error!(