diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-09-30 18:00:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-30 18:00:24 +0000 |
| commit | 7877af152fb32ef32e27304ae9dc49c65dc2fe87 (patch) | |
| tree | 48f62d27bf622e85d4b6732a3c1dac20505b8ada | |
| parent | 3f8834d2aa9295d5370dbfe43d6bc9a4d97bc04b (diff) | |
| parent | 7b8fb1ccab1538f944a18cf338e68f7468cda092 (diff) | |
| download | crosvm-7877af152fb32ef32e27304ae9dc49c65dc2fe87.tar.gz | |
Upgrade to newest vmm_vhost. am: acc126dd7c am: ad832b75e9 am: 7b8fb1ccab
Original change: https://android-review.googlesource.com/c/platform/external/crosvm/+/1839193
Change-Id: Ia97c667a17af712f840fd9e6b2f9a7778be10c5e
| -rw-r--r-- | vhost_user_devices/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vhost_user_devices/src/lib.rs b/vhost_user_devices/src/lib.rs index ab425c281..60eb6d6d4 100644 --- a/vhost_user_devices/src/lib.rs +++ b/vhost_user_devices/src/lib.rs @@ -69,7 +69,7 @@ use vmm_vhost::vhost_user::message::{ VhostUserVringState, }; use vmm_vhost::vhost_user::{ - Error as VhostError, Listener, Result as VhostResult, SlaveFsCacheReq, SlaveListener, + Error as VhostError, Listener, Result as VhostResult, SlaveListener, VhostUserSlaveReqHandlerMut, }; @@ -571,7 +571,7 @@ impl<B: VhostUserBackend> VhostUserSlaveReqHandlerMut for DeviceRequestHandler<B Ok(()) } - fn set_slave_req_fd(&mut self, _vu_req: SlaveFsCacheReq) { + fn set_slave_req_fd(&mut self, _vu_req: File) { // TODO } |