diff options
author | Gurchetan Singh <gurchetansingh@chromium.org> | 2019-05-22 08:57:16 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-24 15:09:26 -0700 |
commit | 53edb817dac31c549464040339a16be3a52e3f74 (patch) | |
tree | ab5db62289dc2f34560791cf6f40d5b4765ea7be /devices/src/virtio/wl.rs | |
parent | 56ebd1238048a71ab5e58c3b20b81c92770eca54 (diff) | |
download | crosvm-53edb817dac31c549464040339a16be3a52e3f74.tar crosvm-53edb817dac31c549464040339a16be3a52e3f74.tar.gz crosvm-53edb817dac31c549464040339a16be3a52e3f74.tar.bz2 crosvm-53edb817dac31c549464040339a16be3a52e3f74.tar.lz crosvm-53edb817dac31c549464040339a16be3a52e3f74.tar.xz crosvm-53edb817dac31c549464040339a16be3a52e3f74.tar.zst crosvm-53edb817dac31c549464040339a16be3a52e3f74.zip |
crosvm: {WlDriverRequest, WlDriverResponse} --> {VmMemoryRequest, VmMemoryResponse}
These type of requests are not necessarily specific to the virtio-wl, and other devices (virtio-gpu) may want to use them. BUG=chromium:924405 TEST=compile Change-Id: Iad0889da8ab3d23bb2378448fc05e3c840a93d93 Reviewed-on: https://chromium-review.googlesource.com/1626791 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: kokoro <noreply+kokoro@google.com> Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'devices/src/virtio/wl.rs')
-rw-r--r-- | devices/src/virtio/wl.rs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs index 4f43266..9919bac 100644 --- a/devices/src/virtio/wl.rs +++ b/devices/src/virtio/wl.rs @@ -73,7 +73,7 @@ use super::resource_bridge::*; use super::{ DescriptorChain, Queue, VirtioDevice, INTERRUPT_STATUS_USED_RING, TYPE_WL, VIRTIO_F_VERSION_1, }; -use vm_control::{MaybeOwnedFd, WlControlRequestSocket, WlDriverRequest, WlDriverResponse}; +use vm_control::{MaybeOwnedFd, VmMemoryControlRequestSocket, VmMemoryRequest, VmMemoryResponse}; const VIRTWL_SEND_MAX_ALLOCS: usize = 28; const VIRTIO_WL_CMD_VFD_NEW: u32 = 256; @@ -489,17 +489,17 @@ impl From<VolatileMemoryError> for WlError { #[derive(Clone)] struct VmRequester { - inner: Rc<RefCell<WlControlRequestSocket>>, + inner: Rc<RefCell<VmMemoryControlRequestSocket>>, } impl VmRequester { - fn new(vm_socket: WlControlRequestSocket) -> VmRequester { + fn new(vm_socket: VmMemoryControlRequestSocket) -> VmRequester { VmRequester { inner: Rc::new(RefCell::new(vm_socket)), } } - fn request(&self, request: WlDriverRequest) -> WlResult<WlDriverResponse> { + fn request(&self, request: VmMemoryRequest) -> WlResult<VmMemoryResponse> { let mut inner = self.inner.borrow_mut(); let vm_socket = &mut *inner; vm_socket.send(&request).map_err(WlError::VmControl)?; @@ -730,12 +730,12 @@ impl WlVfd { vfd_shm .set_size(size_page_aligned) .map_err(WlError::AllocSetSize)?; - let register_response = vm.request(WlDriverRequest::RegisterMemory( + let register_response = vm.request(VmMemoryRequest::RegisterMemory( MaybeOwnedFd::Borrowed(vfd_shm.as_raw_fd()), vfd_shm.size() as usize, ))?; match register_response { - WlDriverResponse::RegisterMemory { pfn, slot } => { + VmMemoryResponse::RegisterMemory { pfn, slot } => { let mut vfd = WlVfd::default(); vfd.guest_shared_memory = Some((vfd_shm.size(), vfd_shm.into())); vfd.slot = Some((slot, pfn, vm)); @@ -753,13 +753,13 @@ impl WlVfd { format: u32, ) -> WlResult<(WlVfd, GpuMemoryDesc)> { let allocate_and_register_gpu_memory_response = - vm.request(WlDriverRequest::AllocateAndRegisterGpuMemory { + vm.request(VmMemoryRequest::AllocateAndRegisterGpuMemory { width, height, format, })?; match allocate_and_register_gpu_memory_response { - WlDriverResponse::AllocateAndRegisterGpuMemory { + VmMemoryResponse::AllocateAndRegisterGpuMemory { fd, pfn, slot, @@ -825,13 +825,13 @@ impl WlVfd { match fd.seek(SeekFrom::End(0)) { Ok(fd_size) => { let size = round_up_to_page_size(fd_size as usize) as u64; - let register_response = vm.request(WlDriverRequest::RegisterMemory( + let register_response = vm.request(VmMemoryRequest::RegisterMemory( MaybeOwnedFd::Borrowed(fd.as_raw_fd()), size as usize, ))?; match register_response { - WlDriverResponse::RegisterMemory { pfn, slot } => { + VmMemoryResponse::RegisterMemory { pfn, slot } => { let mut vfd = WlVfd::default(); vfd.guest_shared_memory = Some((size, fd)); vfd.slot = Some((slot, pfn, vm)); @@ -966,7 +966,7 @@ impl WlVfd { fn close(&mut self) -> WlResult<()> { if let Some((slot, _, vm)) = self.slot.take() { - vm.request(WlDriverRequest::UnregisterMemory(slot))?; + vm.request(VmMemoryRequest::UnregisterMemory(slot))?; } self.socket = None; self.remote_pipe = None; @@ -1005,7 +1005,7 @@ struct WlState { impl WlState { fn new( wayland_path: PathBuf, - vm_socket: WlControlRequestSocket, + vm_socket: VmMemoryControlRequestSocket, use_transition_flags: bool, resource_bridge: Option<ResourceRequestSocket>, ) -> WlState { @@ -1489,7 +1489,7 @@ impl Worker { in_queue: Queue, out_queue: Queue, wayland_path: PathBuf, - vm_socket: WlControlRequestSocket, + vm_socket: VmMemoryControlRequestSocket, use_transition_flags: bool, resource_bridge: Option<ResourceRequestSocket>, ) -> Worker { @@ -1672,7 +1672,7 @@ impl Worker { pub struct Wl { kill_evt: Option<EventFd>, wayland_path: PathBuf, - vm_socket: Option<WlControlRequestSocket>, + vm_socket: Option<VmMemoryControlRequestSocket>, resource_bridge: Option<ResourceRequestSocket>, use_transition_flags: bool, } @@ -1680,7 +1680,7 @@ pub struct Wl { impl Wl { pub fn new<P: AsRef<Path>>( wayland_path: P, - vm_socket: WlControlRequestSocket, + vm_socket: VmMemoryControlRequestSocket, resource_bridge: Option<ResourceRequestSocket>, ) -> Result<Wl> { Ok(Wl { |