pxcloud/vhost-device
5
0
Fork 0
mirror of https://github.com/rust-vmm/vhost-device.git synced 2025-12-27 23:48:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "sound: use thread trait"

Browse Source 
This reverts commit 3ac6c160c1.
This commit is contained in:
Stefano Garzarella 2023-03-31 12:05:58 +02:00
parent 3ac6c160c1
commit 72c31053ff
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/sound/src/vhu_sound.rs
View File

@ -89,30 +89,18 @@ struct VirtioSoundHeader {
// reading its content from byte array.
unsafe impl ByteValued for VirtioSoundHeader {}
trait VhostUserSoundThread {
fn queue_mask(&self) -> u64;
fn set_event_idx(&mut self, enabled: bool);
fn update_memory(&mut self, mem: GuestMemoryAtomic<GuestMemoryMmap>) -> IoResult<()>;
fn handle_event(&self, device_event: u16, vrings: &[VringRwLock]) -> IoResult<bool>;
}
struct VhostUserSoundSingleThread {
struct VhostUserSoundThread {
mem: Option<GuestMemoryAtomic<GuestMemoryMmap>>,
event_idx: bool,
}
impl VhostUserSoundSingleThread {
impl VhostUserSoundThread {
pub fn new() -> Result<Self> {
Ok(VhostUserSoundSingleThread {
Ok(VhostUserSoundThread {
event_idx: false,
mem: None,
})
}
}
impl VhostUserSoundThread for VhostUserSoundSingleThread {
fn queue_mask(&self) -> u64 {
0xffff_ffff
}
fn set_event_idx(&mut self, enabled: bool) {
self.event_idx = enabled;
@ -139,7 +127,7 @@ impl VhostUserSoundThread for VhostUserSoundSingleThread {
}
pub(crate) struct VhostUserSoundBackend {
thread: RwLock<Box<dyn VhostUserSoundThread + Sync + Send>>,
thread: RwLock<VhostUserSoundThread>,
config: VirtioSoundConfig,
queues_per_thread: Vec<u64>,
pub(crate) exit_event: EventFd,
@ -148,10 +136,10 @@ pub(crate) struct VhostUserSoundBackend {
impl VhostUserSoundBackend {
pub fn new(_config: SoundConfig) -> Result<Self> {
let queues_per_thread = vec![0b1111];
let thread = Box::new(VhostUserSoundSingleThread::new()?);
let thread = RwLock::new(VhostUserSoundThread::new()?);
Ok(Self {
thread: RwLock::new(thread),
thread,
config: VirtioSoundConfig {
jacks: 0.into(),
streams: 1.into(),