Change device_event in handle_event() from u16 to usize

When register_event we pass in the value of u32/u64, so we don't
need to convert it to u16 and then pass it to handle_event.

Signed-off-by: Wenyu Huang <[email protected]>

Author: uran0sH

vhost-user-backend/src/backend.rs

@@ -144,7 +144,7 @@ pub trait VhostUserBackend: Send + Sync {
     /// do with events happening on custom listeners.
     fn handle_event(
         &self,
-        device_event: u16,
+        device_event: usize,
         evset: EventSet,
         vrings: &[Self::Vring],
         thread_id: usize,
@@ -288,7 +288,7 @@ pub trait VhostUserBackendMut: Send + Sync {
     /// do with events happening on custom listeners.
     fn handle_event(
         &mut self,
-        device_event: u16,
+        device_event: usize,
         evset: EventSet,
         vrings: &[Self::Vring],
         thread_id: usize,
@@ -390,7 +390,7 @@ impl<T: VhostUserBackend> VhostUserBackend for Arc<T> {
 
     fn handle_event(
         &self,
-        device_event: u16,
+        device_event: usize,
         evset: EventSet,
         vrings: &[Self::Vring],
         thread_id: usize,
@@ -479,7 +479,7 @@ impl<T: VhostUserBackendMut> VhostUserBackend for Mutex<T> {
 
     fn handle_event(
         &self,
-        device_event: u16,
+        device_event: usize,
         evset: EventSet,
         vrings: &[Self::Vring],
         thread_id: usize,
@@ -571,7 +571,7 @@ impl<T: VhostUserBackendMut> VhostUserBackend for RwLock<T> {
 
     fn handle_event(
         &self,
-        device_event: u16,
+        device_event: usize,
         evset: EventSet,
         vrings: &[Self::Vring],
         thread_id: usize,
@@ -711,7 +711,7 @@ pub mod tests {
 
         fn handle_event(
             &mut self,
-            _device_event: u16,
+            _device_event: usize,
             _evset: EventSet,
             _vrings: &[VringRwLock],
             _thread_id: usize,

vhost-user-backend/src/event_loop.rs

@@ -184,10 +184,10 @@ where
                     }
                 };
 
-                let ev_type = event.data() as u16;
+                let ev_type = event.data();
 
                 // handle_event() returns true if an event is received from the exit event fd.
-                if self.handle_event(ev_type, evset)? {
+                if self.handle_event(ev_type as usize, evset)? {
                     break 'epoll;
                 }
             }
@@ -196,13 +196,13 @@ where
         Ok(())
     }
 
-    fn handle_event(&self, device_event: u16, evset: EventSet) -> VringEpollResult<bool> {
-        if self.exit_event_fd.is_some() && device_event as usize == self.backend.num_queues() {
+    fn handle_event(&self, device_event: usize, evset: EventSet) -> VringEpollResult<bool> {
+        if self.exit_event_fd.is_some() && device_event == self.backend.num_queues() {
             return Ok(true);
         }
 
-        if (device_event as usize) < self.vrings.len() {
-            let vring = &self.vrings[device_event as usize];
+        if device_event < self.vrings.len() {
+            let vring = &self.vrings[device_event];
             let enabled = vring
                 .read_kick()
                 .map_err(VringEpollError::HandleEventReadKick)?;

vhost-user-backend/tests/vhost-user-server.rs

@@ -117,7 +117,7 @@ impl VhostUserBackendMut for MockVhostBackend {
 
     fn handle_event(
         &mut self,
-        _device_event: u16,
+        _device_event: usize,
         _evset: EventSet,
         _vrings: &[VringRwLock],
         _thread_id: usize,