@@ -372,7 +372,7 @@ impl Display for VmmActionError {
372
372
use self :: VmmActionError :: * ;
373
373
374
374
let error = match * self {
375
- BootSource ( _, ref err) => err as & ToString ,
375
+ BootSource ( _, ref err) => err as & dyn ToString ,
376
376
DriveConfig ( _, ref err) => err,
377
377
Logger ( _, ref err) => err,
378
378
MachineConfig ( _, ref err) => err,
@@ -538,12 +538,12 @@ enum EpollDispatch {
538
538
}
539
539
540
540
struct MaybeHandler {
541
- handler : Option < Box < EpollHandler > > ,
542
- receiver : Receiver < Box < EpollHandler > > ,
541
+ handler : Option < Box < dyn EpollHandler > > ,
542
+ receiver : Receiver < Box < dyn EpollHandler > > ,
543
543
}
544
544
545
545
impl MaybeHandler {
546
- fn new ( receiver : Receiver < Box < EpollHandler > > ) -> Self {
546
+ fn new ( receiver : Receiver < Box < dyn EpollHandler > > ) -> Self {
547
547
MaybeHandler {
548
548
handler : None ,
549
549
receiver,
@@ -656,7 +656,7 @@ impl EpollContext {
656
656
/// This device's handler will be added to the end of `device_handlers`.
657
657
/// This returns the index of the first token, and a channel on which to
658
658
/// send an epoll handler for the relevant device.
659
- fn allocate_tokens_for_device ( & mut self , count : usize ) -> ( u64 , Sender < Box < EpollHandler > > ) {
659
+ fn allocate_tokens_for_device ( & mut self , count : usize ) -> ( u64 , Sender < Box < dyn EpollHandler > > ) {
660
660
let dispatch_base = self . dispatch_table . len ( ) as u64 ;
661
661
let device_idx = self . device_handlers . len ( ) ;
662
662
let ( sender, receiver) = channel ( ) ;
@@ -692,7 +692,7 @@ impl EpollContext {
692
692
T :: new ( dispatch_base, self . epoll_raw_fd , sender)
693
693
}
694
694
695
- fn get_device_handler_by_handler_id ( & mut self , id : usize ) -> Result < & mut EpollHandler > {
695
+ fn get_device_handler_by_handler_id ( & mut self , id : usize ) -> Result < & mut dyn EpollHandler > {
696
696
let maybe = & mut self . device_handlers [ id] ;
697
697
match maybe. handler {
698
698
Some ( ref mut v) => Ok ( v. as_mut ( ) ) ,
@@ -818,7 +818,7 @@ impl Vmm {
818
818
/// Creates a new VMM object.
819
819
pub fn new (
820
820
api_shared_info : Arc < RwLock < InstanceInfo > > ,
821
- control_fd : & AsRawFd ,
821
+ control_fd : & dyn AsRawFd ,
822
822
from_api : Receiver < Box < VmmAction > > ,
823
823
seccomp_level : u32 ,
824
824
kvm : Kvm ,
@@ -1167,7 +1167,7 @@ impl Vmm {
1167
1167
}
1168
1168
1169
1169
#[ cfg( target_arch = "x86_64" ) ]
1170
- fn get_serial_device ( & self ) -> Option < Arc < Mutex < RawIOHandler > > > {
1170
+ fn get_serial_device ( & self ) -> Option < Arc < Mutex < dyn RawIOHandler > > > {
1171
1171
Some ( self . pio_device_manager . stdio_serial . clone ( ) )
1172
1172
}
1173
1173
0 commit comments