Skip to content

Commit 1419060

Browse files
committed
virtio/snd: fix leftovers after gicv3 switch
The fact that we haven't noticed until now makes me wonder if we really need device (muvm switched to pipeware pass-through via vsock quite a while ago). Signed-off-by: Sergio Lopez <[email protected]>
1 parent a689cee commit 1419060

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/devices/src/virtio/snd/audio_backends.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use super::{stream::Stream, BackendType, Result, VirtioSndPcmSetParams};
1111
pub trait AudioBackend {
1212
fn write(&self, stream_id: u32) -> Result<()>;
1313

14+
#[allow(dead_code)]
1415
fn read(&self, stream_id: u32) -> Result<()>;
1516

1617
fn set_parameters(&self, _stream_id: u32, _: VirtioSndPcmSetParams) -> Result<()> {

src/devices/src/virtio/snd/device.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::io::Write;
22
use std::sync::atomic::AtomicUsize;
3-
use std::sync::{Arc, Mutex};
3+
use std::sync::Arc;
44
use std::thread::JoinHandle;
55

66
use utils::eventfd::EventFd;
@@ -180,7 +180,7 @@ impl VirtioDevice for Snd {
180180
queue_evts,
181181
self.interrupt_status.clone(),
182182
self.interrupt_evt.try_clone().unwrap(),
183-
self.intc,
183+
self.intc.clone(),
184184
self.irq_line,
185185
mem.clone(),
186186
self.worker_stopfd.try_clone().unwrap(),

src/devices/src/virtio/snd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use virtio_sound::*;
2222

2323
use super::{Descriptor, Queue};
2424
use crate::{
25-
legacy::Gic,
25+
legacy::GicV3,
2626
virtio::{
2727
snd::virtio_sound::{VirtioSoundHeader, VirtioSoundPcmStatus},
2828
VIRTIO_MMIO_INT_VRING,

0 commit comments

Comments
 (0)