mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-11 04:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: vhost-user: console: make async functions generic

Browse source 
We want to eventually reuse these functions in the regular virtio device
code, which uses a different kind of interrupt, so make that parameter
generic.

BUG=b:228912920
TEST=cargo build

Change-Id: I1139ce6626ac7b952b7769db6e66d677607d3307
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3600166
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
This commit is contained in:
Alexandre Courbot 2022-04-04 15:53:37 +09:00 committed by Chromeos LUCI
parent 8477c44059
commit 4212e80393
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
devices/src/virtio/vhost/user/device/console.rs
View file

@ -28,12 +28,12 @@ use crate::virtio::vhost::user::device::handler::{
DeviceRequestHandler, Doorbell, VhostUserBackend, DeviceRequestHandler, Doorbell, VhostUserBackend,
}; };
use crate::virtio::vhost::user::device::vvu::pci::VvuPciDevice; use crate::virtio::vhost::user::device::vvu::pci::VvuPciDevice;
use crate::virtio::{self, copy_config}; use crate::virtio::{self, copy_config, SignalableInterrupt};
async fn run_tx_queue( async fn run_tx_queue<I: SignalableInterrupt>(
mut queue: virtio::Queue, mut queue: virtio::Queue,
mem: GuestMemory, mem: GuestMemory,
doorbell: Arc<Mutex<Doorbell>>, doorbell: I,
kick_evt: EventAsync, kick_evt: EventAsync,
mut output: Box<dyn io::Write>, mut output: Box<dyn io::Write>,
) { ) {
@ -46,10 +46,10 @@ async fn run_tx_queue(
} }
} }
async fn run_rx_queue( async fn run_rx_queue<I: SignalableInterrupt>(
mut queue: virtio::Queue, mut queue: virtio::Queue,
mem: GuestMemory, mem: GuestMemory,
doorbell: Arc<Mutex<Doorbell>>, doorbell: I,
kick_evt: EventAsync, kick_evt: EventAsync,
in_buffer: Arc<Mutex<VecDeque<u8>>>, in_buffer: Arc<Mutex<VecDeque<u8>>>,
in_avail_evt: EventAsync, in_avail_evt: EventAsync,