From 9defdd860c90ffd82f4706e9194af2eee7684e7d Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Wed, 8 Jun 2022 16:43:36 +0900 Subject: [PATCH] devices: vhost-user: cras: fix build with `audio_cras` feature http://crrev.com/c/3592633 make `run_with_listener` generic, but did not update the cras vhost-user device to use this new version. BUG=None TEST=Chrome OS build succeeds. Change-Id: I82342e3a2505dc97e5cdaa1749b9091fb986fa35 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3694880 Commit-Queue: Alexandre Courbot Auto-Submit: Alexandre Courbot Tested-by: kokoro Reviewed-by: Keiichi Watanabe --- devices/src/virtio/vhost/user/device/cras_snd.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/src/virtio/vhost/user/device/cras_snd.rs b/devices/src/virtio/vhost/user/device/cras_snd.rs index f3a4ac231c..615306c462 100644 --- a/devices/src/virtio/vhost/user/device/cras_snd.rs +++ b/devices/src/virtio/vhost/user/device/cras_snd.rs @@ -16,7 +16,7 @@ use hypervisor::ProtectionType; use once_cell::sync::OnceCell; use sync::Mutex; use vm_memory::GuestMemory; -use vmm_vhost::connection::socket::Listener as SocketListener; +use vmm_vhost::connection::socket::{Endpoint as SocketEndpoint, Listener as SocketListener}; use vmm_vhost::message::{VhostUserProtocolFeatures, VhostUserVirtioFeatures}; use crate::virtio::snd::cras_backend::{ @@ -273,5 +273,5 @@ pub fn run_cras_snd_device(opts: Options) -> anyhow::Result<()> { let _ = SND_EXECUTOR.set(ex.clone()); // run_until() returns an Result> which the ? operator lets us flatten. - ex.run_until(handler.run_with_listener(listener, &ex))? + ex.run_until(handler.run_with_listener::>(listener, &ex))? }