From 8477c44059f757f68f23749c2579b570ff20fd37 Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Wed, 6 Apr 2022 11:21:37 +0900 Subject: [PATCH] virtio: console: simplify process_transmit_queue The error path reproduces the code outside of the match arm, so it can be removed. BUG=b:228912920 TEST=cargo build Change-Id: Ibd485a52441be03501041bc4136bab9293c7066b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3600165 Reviewed-by: Keiichi Watanabe Commit-Queue: Alexandre Courbot Tested-by: kokoro --- devices/src/virtio/console.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/devices/src/virtio/console.rs b/devices/src/virtio/console.rs index cf12581387..a6a0837562 100644 --- a/devices/src/virtio/console.rs +++ b/devices/src/virtio/console.rs @@ -120,21 +120,14 @@ pub fn process_transmit_queue( while let Some(avail_desc) = transmit_queue.pop(mem) { let desc_index = avail_desc.index; - let reader = match Reader::new(mem.clone(), avail_desc) { - Ok(r) => r, + match Reader::new(mem.clone(), avail_desc) { + Ok(reader) => process_transmit_request(reader, output) + .unwrap_or_else(|e| error!("console: process_transmit_request failed: {}", e)), Err(e) => { error!("console: failed to create reader: {}", e); - transmit_queue.add_used(mem, desc_index, 0); - needs_interrupt = true; - continue; } }; - match process_transmit_request(reader, output) { - Ok(()) => (), - Err(e) => error!("console: process_transmit_request failed: {}", e), - } - transmit_queue.add_used(mem, desc_index, 0); needs_interrupt = true; }