Fix various warnings

Author: ALSchwalm

mythril/src/kmain.rs

@@ -42,6 +42,7 @@ fn default_vm(
                 physdev::com::Uart8250::new(0x3f8)
                     .expect("Failed to create UART"),
             ),
+            ps2_keyboard: None,
         }
     };
 

mythril/src/virtdev/dma.rs

@@ -1,5 +1,5 @@
 use crate::error::Result;
-use crate::virtdev::{DeviceEvent, DeviceRegion, EmulatedDevice, Event, Port};
+use crate::virtdev::{DeviceRegion, EmulatedDevice, Event, Port};
 use alloc::sync::Arc;
 use alloc::vec::Vec;
 use spin::RwLock;
@@ -43,7 +43,7 @@ impl EmulatedDevice for Dma8237 {
         ]
     }
 
-    fn on_event(&mut self, event: Event) -> Result<()> {
+    fn on_event(&mut self, _event: Event) -> Result<()> {
         Ok(())
     }
 }

mythril/src/virtdev/ignore.rs

@@ -1,5 +1,5 @@
 use crate::error::Result;
-use crate::virtdev::{DeviceEvent, DeviceRegion, EmulatedDevice, Event, Port};
+use crate::virtdev::{DeviceRegion, EmulatedDevice, Event};
 use alloc::sync::Arc;
 use alloc::vec::Vec;
 use spin::RwLock;
@@ -33,7 +33,7 @@ impl EmulatedDevice for IgnoredDevice {
         ]
     }
 
-    fn on_event(&mut self, event: Event) -> Result<()> {
+    fn on_event(&mut self, _event: Event) -> Result<()> {
         Ok(())
     }
 }

mythril/src/virtdev/keyboard.rs

@@ -26,7 +26,7 @@ impl EmulatedDevice for Keyboard8042 {
 
     fn on_event(&mut self, event: Event) -> Result<()> {
         match event.kind {
-            DeviceEvent::PortRead((port, mut val)) => {
+            DeviceEvent::PortRead((_port, mut val)) => {
                 //FIXME: For now just return 0xff for everything
                 val.copy_from_u32(0xff);
             }

mythril/src/virtdev/lapic.rs

@@ -1,6 +1,6 @@
 use crate::error::Result;
 use crate::memory::GuestPhysAddr;
-use crate::virtdev::{DeviceEvent, DeviceRegion, EmulatedDevice, Event, Port};
+use crate::virtdev::{DeviceRegion, EmulatedDevice, Event};
 use alloc::sync::Arc;
 use alloc::vec::Vec;
 use spin::RwLock;
@@ -31,7 +31,7 @@ impl EmulatedDevice for LocalApic {
         ]
     }
 
-    fn on_event(&mut self, event: Event) -> Result<()> {
+    fn on_event(&mut self, _event: Event) -> Result<()> {
         Ok(())
     }
 }

mythril/src/virtdev/pos.rs

@@ -32,7 +32,7 @@ impl EmulatedDevice for ProgrammableOptionSelect {
 
     fn on_event(&mut self, event: Event) -> Result<()> {
         match event.kind {
-            DeviceEvent::PortRead((port, mut val)) => {
+            DeviceEvent::PortRead((_port, mut val)) => {
                 val.copy_from_u32(0);
             }
             _ => (),

mythril/src/vm.rs

@@ -5,11 +5,8 @@ use crate::memory::{
     Raw4kPage,
 };
 use crate::physdev;
-use crate::vcpu;
 use crate::virtdev::{
-    DeviceEvent, DeviceInteraction, DeviceMap, Event, MemReadRequest,
-    MemWriteRequest, Port, PortReadRequest, PortWriteRequest,
-    ResponseEventArray,
+    DeviceEvent, DeviceInteraction, DeviceMap, Event, ResponseEventArray,
 };
 use alloc::boxed::Box;
 use alloc::collections::BTreeMap;
@@ -25,6 +22,9 @@ pub static mut VM_MAP: Option<BTreeMap<usize, Arc<RwLock<VirtualMachine>>>> =
 pub struct PhysicalDeviceConfig {
     /// The physical serial connection for this VM (if any).
     pub serial: Option<physdev::com::Uart8250>,
+
+    /// The physical ps2 keyboard connection for this VM (if any).
+    pub ps2_keyboard: Option<physdev::keyboard::Ps2Controller>,
 }
 
 /// A configuration for a `VirtualMachine`

mythril/src/vmcs.rs

@@ -402,7 +402,7 @@ impl Vmcs {
 
 pub struct ActiveVmcs {
     vmcs: Vmcs,
-    vmx: vmx::Vmx,
+    pub vmx: vmx::Vmx,
 }
 
 impl ActiveVmcs {
@@ -549,13 +549,13 @@ impl fmt::Display for ActiveVmcs {
 
 pub struct TemporaryActiveVmcs<'a> {
     vmcs: &'a mut Vmcs,
-    _vmx: &'a mut vmx::Vmx,
+    pub vmx: &'a mut vmx::Vmx,
 }
 
 impl<'a> TemporaryActiveVmcs<'a> {
     fn new(vmcs: &'a mut Vmcs, vmx: &'a mut vmx::Vmx) -> Result<Self> {
         vmcs_activate(vmcs, vmx)?;
-        Ok(Self { vmcs, _vmx: vmx })
+        Ok(Self { vmcs, vmx: vmx })
     }
 
     pub fn read_field(&mut self, field: VmcsField) -> Result<u64> {

mythril/src/vmx.rs

@@ -1,5 +1,5 @@
 use crate::error::{self, Error, Result};
-use crate::memory::Raw4kPage;
+use crate::memory::{GuestVirtAddr, Raw4kPage};
 use alloc::boxed::Box;
 use raw_cpuid::CpuId;
 use x86::msr;