kvm: fix clippy warnings

Wenzel · Feb 20, 2024 · 079bb34 · 079bb34
1 parent a65c081
commit 079bb34
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/driver/kvm.rs b/src/driver/kvm.rs
@@ -130,7 +130,7 @@ impl<T: KVMIntrospectable> Kvm<T> {
 
         // set vec_events size
         let vcpu_count = kvm.get_vcpu_count()?;
-        kvm.vec_events.resize_with(vcpu_count.try_into()?, || None);
+        kvm.vec_events.resize_with(vcpu_count.into(), || None);
 
         // enable CR event intercept by default
         // (interception will take place when CR register will be specified)
@@ -323,7 +323,7 @@ impl<T: KVMIntrospectable> Introspectable for Kvm<T> {
                 };
 
                 let vcpu = kvmi_event.vcpu;
-                let vcpu_index: usize = vcpu.try_into()?;
+                let vcpu_index: usize = vcpu.into();
                 self.vec_events[vcpu_index] = Some(kvmi_event);
 
                 Ok(Some(Event {
@@ -343,8 +343,8 @@ impl<T: KVMIntrospectable> Introspectable for Kvm<T> {
             EventReplyType::Continue => KVMiEventReply::Continue,
         };
         // get KVMiEvent associated with this VCPU
-        let vcpu_index: usize = event.vcpu.try_into()?;
-        let kvmi_event = mem::replace(&mut self.vec_events[vcpu_index], None).unwrap();
+        let vcpu_index: usize = event.vcpu.into();
+        let kvmi_event = &mut self.vec_events[vcpu_index].take();
         Ok(self.kvmi.reply(&kvmi_event, kvm_reply_type)?)
     }