summary refs log tree commit diff
path: root/devices
diff options
context:
space:
mode:
authorpaulhsia <paulhsia@chromium.org>2020-04-27 17:58:02 +0800
committerCommit Bot <commit-bot@chromium.org>2020-04-29 00:12:33 +0000
commit7b8f776cb807ce1174899e567b2b00a040fe409f (patch)
tree86bc26897284288a729c5e86837fcdf13b60632c /devices
parent9f0b9e9785c97c7ba604525b8691c75749047ec4 (diff)
downloadcrosvm-7b8f776cb807ce1174899e567b2b00a040fe409f.tar
crosvm-7b8f776cb807ce1174899e567b2b00a040fe409f.tar.gz
crosvm-7b8f776cb807ce1174899e567b2b00a040fe409f.tar.bz2
crosvm-7b8f776cb807ce1174899e567b2b00a040fe409f.tar.lz
crosvm-7b8f776cb807ce1174899e567b2b00a040fe409f.tar.xz
crosvm-7b8f776cb807ce1174899e567b2b00a040fe409f.tar.zst
crosvm-7b8f776cb807ce1174899e567b2b00a040fe409f.zip
ac97: Create CrasClient with unified socket
Since Termina and ARCVM need both playback and capture functionalities,
we create CrasClient with CrasSocketType::Unified.

BUG=b:155048379
TEST=Apply full patch set and test with VMs

Cq-Depend: chromium:2165697
Cq-Depend: chromium:2167813
Change-Id: Id4fb12423eb05859528406ae7ed5e62b46909a56
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2167312
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Tested-by: Chih-Yang Hsia <paulhsia@chromium.org>
Commit-Queue: Chih-Yang Hsia <paulhsia@chromium.org>
Diffstat (limited to 'devices')
-rw-r--r--devices/src/pci/ac97.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/devices/src/pci/ac97.rs b/devices/src/pci/ac97.rs
index d061746..228346d 100644
--- a/devices/src/pci/ac97.rs
+++ b/devices/src/pci/ac97.rs
@@ -12,7 +12,7 @@ use audio_streams::{
     shm_streams::{NullShmStreamSource, ShmStreamSource},
     StreamEffect,
 };
-use libcras::{CrasClient, CrasClientType};
+use libcras::{CrasClient, CrasClientType, CrasSocketType};
 use resources::{Alloc, MmioType, SystemAllocator};
 use sys_util::{error, EventFd, GuestMemory};
 
@@ -117,8 +117,10 @@ impl Ac97Dev {
     }
 
     fn create_cras_audio_device(params: Ac97Parameters, mem: GuestMemory) -> Result<Ac97Dev> {
-        let mut server =
-            Box::new(CrasClient::new().map_err(|e| pci_device::Error::CreateCrasClientFailed(e))?);
+        let mut server = Box::new(
+            CrasClient::with_type(CrasSocketType::Unified)
+                .map_err(|e| pci_device::Error::CreateCrasClientFailed(e))?,
+        );
         server.set_client_type(CrasClientType::CRAS_CLIENT_TYPE_CROSVM);
         if params.capture {
             server.enable_cras_capture();