@@ -23,17 +23,19 @@ use std::io::Result;
2323use std:: ops:: Deref ;
2424use std:: sync:: { Arc , Mutex , RwLock } ;
2525
26+ use mio:: event:: Event ;
2627use vhost:: vhost_user:: message:: {
2728 VhostTransferStateDirection , VhostTransferStatePhase , VhostUserProtocolFeatures ,
2829 VhostUserSharedMsg ,
2930} ;
3031use vhost:: vhost_user:: Backend ;
3132use vm_memory:: bitmap:: Bitmap ;
32- use vmm_sys_util:: epoll:: EventSet ;
3333use vmm_sys_util:: eventfd:: EventFd ;
3434
3535use vhost:: vhost_user:: GpuBackend ;
3636
37+ use crate :: event_loop:: VringEventSet ;
38+
3739use super :: vring:: VringT ;
3840use super :: GM ;
3941
@@ -144,7 +146,7 @@ pub trait VhostUserBackend: Send + Sync {
144146 fn handle_event (
145147 & self ,
146148 device_event : u16 ,
147- evset : EventSet ,
149+ evset : VringEventSet ,
148150 vrings : & [ Self :: Vring ] ,
149151 thread_id : usize ,
150152 ) -> Result < ( ) > ;
@@ -287,7 +289,7 @@ pub trait VhostUserBackendMut: Send + Sync {
287289 fn handle_event (
288290 & mut self ,
289291 device_event : u16 ,
290- evset : EventSet ,
292+ evset : VringEventSet ,
291293 vrings : & [ Self :: Vring ] ,
292294 thread_id : usize ,
293295 ) -> Result < ( ) > ;
@@ -389,7 +391,7 @@ impl<T: VhostUserBackend> VhostUserBackend for Arc<T> {
389391 fn handle_event (
390392 & self ,
391393 device_event : u16 ,
392- evset : EventSet ,
394+ evset : VringEventSet ,
393395 vrings : & [ Self :: Vring ] ,
394396 thread_id : usize ,
395397 ) -> Result < ( ) > {
@@ -478,7 +480,7 @@ impl<T: VhostUserBackendMut> VhostUserBackend for Mutex<T> {
478480 fn handle_event (
479481 & self ,
480482 device_event : u16 ,
481- evset : EventSet ,
483+ evset : VringEventSet ,
482484 vrings : & [ Self :: Vring ] ,
483485 thread_id : usize ,
484486 ) -> Result < ( ) > {
@@ -570,7 +572,7 @@ impl<T: VhostUserBackendMut> VhostUserBackend for RwLock<T> {
570572 fn handle_event (
571573 & self ,
572574 device_event : u16 ,
573- evset : EventSet ,
575+ evset : VringEventSet ,
574576 vrings : & [ Self :: Vring ] ,
575577 thread_id : usize ,
576578 ) -> Result < ( ) > {
@@ -600,6 +602,7 @@ pub mod tests {
600602 use super :: * ;
601603 use crate :: VringRwLock ;
602604 use libc:: EFD_NONBLOCK ;
605+ use mio:: Interest ;
603606 use std:: sync:: Mutex ;
604607 use uuid:: Uuid ;
605608 use vm_memory:: { GuestAddress , GuestMemoryAtomic , GuestMemoryMmap } ;
@@ -707,7 +710,7 @@ pub mod tests {
707710 fn handle_event (
708711 & mut self ,
709712 _device_event : u16 ,
710- _evset : EventSet ,
713+ _evset : VringEventSet ,
711714 _vrings : & [ VringRwLock ] ,
712715 _thread_id : usize ,
713716 ) -> Result < ( ) > {
@@ -793,7 +796,7 @@ pub mod tests {
793796
794797 let vring = VringRwLock :: new ( mem, 0x1000 ) . unwrap ( ) ;
795798 backend
796- . handle_event ( 0x1 , EventSet :: IN , & [ vring] , 0 )
799+ . handle_event ( 0x1 , ( & Interest :: READABLE ) . into ( ) , & [ vring] , 0 )
797800 . unwrap ( ) ;
798801
799802 backend. reset_device ( ) ;
0 commit comments