From d84f8b5f141560ca2c87f87b2edd0f8e9bc4ce76 Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Tue, 5 Jul 2022 18:52:37 +0900 Subject: [PATCH] virtio: vhost-user: cras: fix build 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 Tested-by: kokoro Commit-Queue: Alexandre Courbot --- devices/src/virtio/vhost/user/device/cras_snd.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devices/src/virtio/vhost/user/device/cras_snd.rs b/devices/src/virtio/vhost/user/device/cras_snd.rs index 95cf8e2e91..8d603e6e78 100644 --- a/devices/src/virtio/vhost/user/device/cras_snd.rs +++ b/devices/src/virtio/vhost/user/device/cras_snd.rs @@ -16,7 +16,6 @@ use hypervisor::ProtectionType; use once_cell::sync::OnceCell; use sync::Mutex; use vm_memory::GuestMemory; -use vmm_vhost::connection::socket::{Endpoint as SocketEndpoint, Listener as SocketListener}; use vmm_vhost::message::{VhostUserProtocolFeatures, VhostUserVirtioFeatures}; 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::vhost::user::device::{ - handler::{sys::Doorbell, DeviceRequestHandler, VhostUserBackend}, + handler::{sys::Doorbell, VhostUserBackend}, listener::{sys::VhostUserListener, VhostUserListenerTrait}, }; 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 listener = VhostUserListener::new_socket(&socket, None); + let listener = VhostUserListener::new_socket(&opts.socket, None)?; // run_until() returns an Result> which the ? operator lets us flatten. ex.run_until(listener.run_backend(snd_device, &ex))? }