mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-06 02:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: virtio-wl: reuse register_memory() helper

Browse source 
Use the existing register_memory() function that does the same thing as
the open-coded registration request.

BUG=None
TEST=tools/presubmit

Change-Id: I62956c2b4ceb288f7b76a4e85c27e288c496c73b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3470538
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Daniel Verkamp 2021-11-15 20:15:49 -08:00 committed by Commit Bot
parent 18cccb3d65
commit 237581bfa8
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
devices/src/virtio/wl.rs
View file

@ -600,15 +600,11 @@ impl WlVfd {
let vfd_shm = let vfd_shm =
SharedMemory::named("virtwl_alloc", size_page_aligned).map_err(WlError::NewAlloc)?; SharedMemory::named("virtwl_alloc", size_page_aligned).map_err(WlError::NewAlloc)?;
let register_request = VmMemoryRequest::RegisterMemory(vfd_shm); let (vfd_shm, register_response) = vm.register_memory(vfd_shm)?;
let register_response = vm.request(&register_request)?;
match register_response { match register_response {
VmMemoryResponse::RegisterMemory { pfn, slot } => { VmMemoryResponse::RegisterMemory { pfn, slot } => {
let mut vfd = WlVfd::default(); let mut vfd = WlVfd::default();
let vfd_shm = match register_request {
VmMemoryRequest::RegisterMemory(shm) => shm,
_ => unreachable!(),
};
vfd.guest_shared_memory = Some(vfd_shm); vfd.guest_shared_memory = Some(vfd_shm);
vfd.slot = Some((slot, pfn, vm)); vfd.slot = Some((slot, pfn, vm));
Ok(vfd) Ok(vfd)