commit 339b7b680174fc280a4d106a35fd3e82270f4b6b
author Alexandre Courbot <acourbot@chromium.org> Tue Dec 28 16:05:01 2021 +0900
committer Commit Bot <commit-bot@chromium.org> Wed Jan 12 07:58:53 2022 +0000
tree b40e340828f4d57ab857ae18028de916de354dc8
parent 5a250fcb263790b2d4113e352d46f60a93140eff

virtio: video: rename UnresolvedGuestResource to UnresolvedResourceEntry

The current naming is a bit confusing: a resource is one or several
buffers that are each made of one or several entries. The elements that
we return to the device are thus resource entries (that need to be
resolved into a single resource) and not the whole resources themselves.

BUG=b:209523781
TEST=cargo build --features "video-decoder,video-encoder"

Change-Id: Ie3d89c48f9b3e7758b455ea1b2d4954daf248d0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3379628
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>

devices/src/virtio/video/command.rs

diff --git a/devices/src/virtio/video/command.rs b/devices/src/virtio/video/command.rs
index 6a891db..d0a2413 100644
--- a/devices/src/virtio/video/command.rs
+++ b/devices/src/virtio/video/command.rs
@@ -17,7 +17,7 @@
 use crate::virtio::video::format::*;
 use crate::virtio::video::params::Params;
 use crate::virtio::video::protocol::*;
-use crate::virtio::video::resource::{ResourceType, UnresolvedGuestResource};
+use crate::virtio::video::resource::{ResourceType, UnresolvedResourceEntry};
 use crate::virtio::Reader;
 
 /// An error indicating a failure while reading a request from the guest.
@@ -68,7 +68,7 @@
         queue_type: QueueType,
         resource_id: u32,
         plane_offsets: Vec<u32>,
-        resource: UnresolvedGuestResource,
+        resource: UnresolvedResourceEntry,
     },
     ResourceQueue {
         stream_id: u32,

devices/src/virtio/video/decoder/mod.rs

diff --git a/devices/src/virtio/video/decoder/mod.rs b/devices/src/virtio/video/decoder/mod.rs
index e47f2f6..59e923a 100644
--- a/devices/src/virtio/video/decoder/mod.rs
+++ b/devices/src/virtio/video/decoder/mod.rs
@@ -499,7 +499,7 @@
         queue_type: QueueType,
         resource_id: ResourceId,
         plane_offsets: Vec<u32>,
-        resource: UnresolvedGuestResource,
+        resource: UnresolvedResourceEntry,
     ) -> VideoResult<VideoCmdResponseType> {
         let ctx = self.contexts.get_mut(&stream_id)?;
 

devices/src/virtio/video/encoder/mod.rs

diff --git a/devices/src/virtio/video/encoder/mod.rs b/devices/src/virtio/video/encoder/mod.rs
index 7f7c370..0ceb202 100644
--- a/devices/src/virtio/video/encoder/mod.rs
+++ b/devices/src/virtio/video/encoder/mod.rs
@@ -578,7 +578,7 @@
         queue_type: QueueType,
         resource_id: u32,
         plane_offsets: Vec<u32>,
-        resource: UnresolvedGuestResource,
+        resource: UnresolvedResourceEntry,
     ) -> VideoResult<VideoCmdResponseType> {
         let stream = self
             .streams

devices/src/virtio/video/resource.rs

diff --git a/devices/src/virtio/video/resource.rs b/devices/src/virtio/video/resource.rs
index e7aaf48..218e089 100644
--- a/devices/src/virtio/video/resource.rs
+++ b/devices/src/virtio/video/resource.rs
@@ -29,13 +29,13 @@
 
 #[repr(C)]
 #[derive(Clone, Copy)]
-/// A guest resource which type is not decided yet.
-pub union UnresolvedGuestResource {
+/// A guest resource entry which type is not decided yet.
+pub union UnresolvedResourceEntry {
     pub object: virtio_video_object_entry,
 }
-unsafe impl data_model::DataInit for UnresolvedGuestResource {}
+unsafe impl data_model::DataInit for UnresolvedResourceEntry {}
 
-impl fmt::Debug for UnresolvedGuestResource {
+impl fmt::Debug for UnresolvedResourceEntry {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         // Safe because `self.object` is a [u8] and thus is valid no matter its raw data.
         write!(f, "unresolved {:?}", unsafe { self.object })