mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-10 12:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: vhost: user: snd:: Implement VVU snd

Browse source 
Support running snd device backend over vvu.

BUG=b:213532566
TEST=go/virtio-vhost-user-dev-guide
TEST=run a vm for the device with vvu proxy
TEST=run snd device inside the vm (use null backend)
TEST=start a new vm with --vhost-user-snd
TEST=call aplay from the new vm

Change-Id: I5460fca34235c95b098fe2d284e403f6c505df62
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3809193
Commit-Queue: Norman Bintang <normanbt@chromium.org>
Tested-by: Norman Bintang <normanbt@chromium.org>
Reviewed-by: Chih-Yang Hsia <paulhsia@chromium.org>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
This commit is contained in:
Norman Bintang 2022-07-29 10:05:56 +00:00 committed by crosvm LUCI
parent 98acb60918
commit 2bb5d198fd
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
devices/src/virtio/vhost/user/device/snd.rs
View file

@ -273,7 +273,10 @@ impl VhostUserBackend for SndBackend {
pub struct CrasOptions {
#[argh(option, arg_name = "PATH")]
/// path to a socket
socket: String,
socket: Option<String>,
#[argh(option, arg_name = "CONFIG")]
/// VFIO-PCI device name (e.g. '0000:00:07.0')
vfio: Option<String>,
#[argh(option, arg_name = "CONFIG")]
/// comma separated key=value pairs for setting up cras snd devices.
/// Possible key values:
@ -293,8 +296,11 @@ pub struct CrasOptions {
/// Snd device
pub struct Options {
#[argh(option, arg_name = "PATH")]
/// path to a socket
socket: String,
/// path to bind a listening vhost-user socket
socket: Option<String>,
#[argh(option, arg_name = "STRING")]
/// VFIO-PCI device name (e.g. '0000:00:07.0')
vfio: Option<String>,
#[argh(option, arg_name = "CONFIG")]
/// comma separated key=value pairs for setting up cras snd devices.
/// Possible key values:
@ -323,7 +329,7 @@ pub fn run_cras_snd_device(opts: CrasOptions) -> anyhow::Result<()> {
..params
};
run(params, opts.socket)
run(params, opts.socket, opts.vfio)
}
/// Starts a vhost-user snd device.
@ -334,10 +340,14 @@ pub fn run_snd_device(opts: Options) -> anyhow::Result<()> {
.unwrap_or("".to_string())
.parse::<Parameters>()?;
run(params, opts.socket)
run(params, opts.socket, opts.vfio)
}
fn run(params: Parameters, socket_path: String) -> anyhow::Result<()> {
fn run(
params: Parameters,
socket_path: Option<String>,
vfio: Option<String>,
) -> anyhow::Result<()> {
let snd_device = Box::new(SndBackend::new(params)?);
// Child, we can continue by spawning the executor and set up the device
@ -345,7 +355,12 @@ fn run(params: Parameters, socket_path: String) -> anyhow::Result<()> {
let _ = SND_EXECUTOR.set(ex.clone());
let listener = VhostUserListener::new_socket(&socket_path, None)?;
let listener = VhostUserListener::new_from_socket_or_vfio(
&socket_path,
&vfio,
snd_device.max_queue_num(),
None,
)?;
// run_until() returns an Result<Result<..>> which the ? operator lets us flatten.
ex.run_until(listener.run_backend(snd_device, &ex))?
}