diff options
author | Judy Hsiao <judyhsiao@google.com> | 2020-05-26 18:15:56 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-06-01 09:58:50 +0000 |
commit | 04a2881b03f14dea52364382f695b28a43764031 (patch) | |
tree | 3394736274d2798398a0c944ed551fad02bb9ef1 | |
parent | c14eeae48121c2e6691618e6e5404aab2891ecde (diff) | |
download | crosvm-04a2881b03f14dea52364382f695b28a43764031.tar crosvm-04a2881b03f14dea52364382f695b28a43764031.tar.gz crosvm-04a2881b03f14dea52364382f695b28a43764031.tar.bz2 crosvm-04a2881b03f14dea52364382f695b28a43764031.tar.lz crosvm-04a2881b03f14dea52364382f695b28a43764031.tar.xz crosvm-04a2881b03f14dea52364382f695b28a43764031.tar.zst crosvm-04a2881b03f14dea52364382f695b28a43764031.zip |
ac97: Uses audio_streams::BoxError
audio_streams export BoxError which can be passed between threads. Adopts the API change accordingly. BUG=b:149437381 TEST=emerge-{BOARD} crosvm Cq-Depend: chromium:2215772 Change-Id: I524e9d7ab3c16b7b6d3714187f166dce72d243cb Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2214971 Tested-by: Judy Hsiao <judyhsiao@chromium.org> Reviewed-by: Chih-Yang Hsia <paulhsia@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> Commit-Queue: Judy Hsiao <judyhsiao@chromium.org>
-rw-r--r-- | devices/src/pci/ac97_bus_master.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/devices/src/pci/ac97_bus_master.rs b/devices/src/pci/ac97_bus_master.rs index 22f3c92..2769f8d 100644 --- a/devices/src/pci/ac97_bus_master.rs +++ b/devices/src/pci/ac97_bus_master.rs @@ -15,7 +15,7 @@ use std::time::{Duration, Instant}; use audio_streams::{ shm_streams::{ShmStream, ShmStreamSource}, - DummyStreamControl, SampleFormat, StreamControl, StreamDirection, StreamEffect, + BoxError, DummyStreamControl, SampleFormat, StreamControl, StreamDirection, StreamEffect, }; use sync::{Condvar, Mutex}; use sys_util::{ @@ -105,7 +105,7 @@ type GuestMemoryResult<T> = std::result::Result<T, GuestMemoryError>; #[derive(Debug)] enum AudioError { // Failed to create a new stream. - CreateStream(Box<dyn Error>), + CreateStream(BoxError), // Invalid buffer offset received from the audio server. InvalidBufferOffset, // Guest did not provide a buffer when needed. @@ -113,9 +113,9 @@ enum AudioError { // Failure to read guest memory. ReadingGuestError(GuestMemoryError), // Failure to respond to the ServerRequest. - RespondRequest(Box<dyn Error>), + RespondRequest(BoxError), // Failure to wait for a request from the stream. - WaitForAction(Box<dyn Error>), + WaitForAction(BoxError), } impl std::error::Error for AudioError {} |