mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio: console: simplify process_transmit_queue

Browse source 
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 <keiichiw@chromium.org>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Alexandre Courbot 2022-04-06 11:21:37 +09:00 committed by Chromeos LUCI
parent e8d53e8ee6
commit 8477c44059
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
devices/src/virtio/console.rs
View file

@ -120,21 +120,14 @@ pub fn process_transmit_queue<I: SignalableInterrupt>(
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;
}