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

virtio: vhost-user: cras: fix build

Browse source 
Another one in the long tradition of forgetting to update cras...

BUG=None
TEST=emerge crosvm passes for Hatch.

Change-Id: Id2a2675ffbc7bcd2908f4682055b7848321bbe0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3744915
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-07-05 18:52:37 +09:00 committed by Chromeos LUCI
parent a99ad34826
commit d84f8b5f14
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devices/src/virtio/vhost/user/device/cras_snd.rs
View file

@ -16,7 +16,6 @@ use hypervisor::ProtectionType;
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use sync::Mutex; use sync::Mutex;
use vm_memory::GuestMemory; use vm_memory::GuestMemory;
use vmm_vhost::connection::socket::{Endpoint as SocketEndpoint, Listener as SocketListener};
use vmm_vhost::message::{VhostUserProtocolFeatures, VhostUserVirtioFeatures}; use vmm_vhost::message::{VhostUserProtocolFeatures, VhostUserVirtioFeatures};
use crate::virtio::snd::cras_backend::{ use crate::virtio::snd::cras_backend::{
@ -26,7 +25,7 @@ use crate::virtio::snd::cras_backend::{
}; };
use crate::virtio::snd::layout::virtio_snd_config; use crate::virtio::snd::layout::virtio_snd_config;
use crate::virtio::vhost::user::device::{ use crate::virtio::vhost::user::device::{
handler::{sys::Doorbell, DeviceRequestHandler, VhostUserBackend}, handler::{sys::Doorbell, VhostUserBackend},
listener::{sys::VhostUserListener, VhostUserListenerTrait}, listener::{sys::VhostUserListener, VhostUserListenerTrait},
}; };
use crate::virtio::{self, copy_config}; use crate::virtio::{self, copy_config};
@ -274,7 +273,7 @@ pub fn run_cras_snd_device(opts: Options) -> anyhow::Result<()> {
let _ = SND_EXECUTOR.set(ex.clone()); let _ = SND_EXECUTOR.set(ex.clone());
let listener = VhostUserListener::new_socket(&socket, None); let listener = VhostUserListener::new_socket(&opts.socket, None)?;
// run_until() returns an Result<Result<..>> which the ? operator lets us flatten. // run_until() returns an Result<Result<..>> which the ? operator lets us flatten.
ex.run_until(listener.run_backend(snd_device, &ex))? ex.run_until(listener.run_backend(snd_device, &ex))?
} }