Merge pull request #50 from Wenzel/update_deps

Update deps

Author: Wenzel

.github/workflows/ci.yml

@@ -94,7 +94,7 @@ jobs:
         run: cargo deb -- --examples
 
       - name: upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: kvmi_deb
           # kvmi_x.x.x_amd64.deb

Cargo.toml

@@ -13,18 +13,18 @@ categories = ["api-bindings"]
 
 
 [dependencies]
-log = "0.4.8"
-kvmi-sys = "0.2.2"
-enum-primitive-derive = "0.1.2"
-num-traits = "0.2.8"
-nix = "0.16.1"
-libc = "0.2.66"
-libloading = "0.6.1"
-mockall = "0.7.1"
-thiserror = "1.0"
+log = "0.4.26"
+kvmi-sys = "0.3.0"
+enum-primitive-derive = "0.3.0"
+num-traits = "0.2.19"
+nix = "0.29.0"
+libc = "0.2.170"
+libloading = "0.8.6"
+mockall = "0.13.1"
+thiserror = "2.0.11"
 
 [dev-dependencies]
-env_logger = "0.8.3"
+env_logger = "0.11.6"
 clap = "2.33.3"
 indicatif = "0.15.0"
 
@@ -40,6 +40,4 @@ extended-description = "A collection of utilities to perform virtual machine int
 depends = "libc6"
 section = "utility"
 priority = "optional"
-assets = [
-    ["target/release/examples/mem-dump", "usr/bin/kvmi-mem-dump", "755"],
-]
+assets = [["target/release/examples/mem-dump", "usr/bin/kvmi-mem-dump", "755"]]

src/lib.rs

@@ -125,9 +125,9 @@ pub enum KVMiMsrIndices {
     SysenterCs = 0x174,
     SysenterEsp = 0x175,
     SysenterEip = 0x176,
-    MsrEfer = 0xc0000080,
-    MsrStar = 0xc0000081,
-    MsrLstar = 0xc0000082,
+    MsrEfer = 0xc0000080u32,
+    MsrStar = 0xc0000081u32,
+    MsrLstar = 0xc0000082u32,
 }
 
 pub enum SocketType {
@@ -191,7 +191,7 @@ impl KvmMsrs {
         let mut msrs = KvmMsrs {
             internal_msrs: unsafe { Box::from_raw(internal_msrs) },
         };
-        let mut msrs_as_slice = msrs.as_slice_mut();
+        let msrs_as_slice = msrs.as_slice_mut();
         msrs_as_slice[0].index = KVMiMsrIndices::SysenterCs as u32;
         msrs_as_slice[1].index = KVMiMsrIndices::SysenterEsp as u32;
         msrs_as_slice[2].index = KVMiMsrIndices::SysenterEip as u32;
@@ -479,7 +479,7 @@ impl KVMIntrospectable for KVMi {
             return Err(Error::last_os_error());
         }
         let ev_type = unsafe {
-            let ev_u8 = (*ev_ptr).event.common.event.try_into().unwrap();
+            let ev_u8 = (*ev_ptr).event.common.event.into();
             match KVMiInterceptType::from_u32(ev_u8).unwrap() {
                 KVMiInterceptType::PauseVCPU => KVMiEventType::PauseVCPU,
                 KVMiInterceptType::Breakpoint => KVMiEventType::Breakpoint {
@@ -500,10 +500,8 @@ impl KVMIntrospectable for KVMi {
                 },
 
                 KVMiInterceptType::Cr => KVMiEventType::Cr {
-                    cr_type: KVMiCr::from_i32(
-                        (*ev_ptr).event.__bindgen_anon_1.cr.cr.try_into().unwrap(),
-                    )
-                    .unwrap(),
+                    cr_type: KVMiCr::from_i32((*ev_ptr).event.__bindgen_anon_1.cr.cr.into())
+                        .unwrap(),
                     new: (*ev_ptr).event.__bindgen_anon_1.cr.new_value,
                     old: (*ev_ptr).event.__bindgen_anon_1.cr.old_value,
                 },
@@ -556,15 +554,15 @@ impl KVMIntrospectable for KVMi {
             KVMiEventType::PauseVCPU => {
                 let size = mem::size_of::<EventReplyCommon>();
                 let rpl_ptr: *const c_void = &reply_common as *const _ as *const c_void;
-                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size as usize)
+                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size)
             }
             KVMiEventType::Breakpoint {
                 gpa: _,
                 insn_len: _,
             } => {
                 let size = mem::size_of::<EventReplyCommon>();
                 let rpl_ptr: *const c_void = &reply_common as *const _ as *const c_void;
-                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size as usize)
+                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size)
             }
             KVMiEventType::Pagefault {
                 gpa: _,
@@ -589,7 +587,7 @@ impl KVMIntrospectable for KVMi {
                 reply.pf.ctx_data = [0; 256];
                 let size = mem::size_of::<EventReplyPagefault>();
                 let rpl_ptr: *const c_void = &reply as *const _ as *const c_void;
-                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size as usize)
+                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size)
             }
             KVMiEventType::Cr {
                 cr_type: _,
@@ -609,7 +607,7 @@ impl KVMIntrospectable for KVMi {
                 reply.cr.new_val = new;
                 let size = mem::size_of::<EventReplyCr>();
                 let rpl_ptr: *const c_void = &reply as *const _ as *const c_void;
-                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size as usize)
+                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size)
             }
 
             KVMiEventType::Msr {
@@ -631,7 +629,7 @@ impl KVMIntrospectable for KVMi {
                 reply.msr.new_val = new;
                 let size = mem::size_of::<EventReplyMsr>();
                 let rpl_ptr: *const c_void = &reply as *const _ as *const c_void;
-                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size as usize)
+                (self.libkvmi.reply_event)(self.dom, seq, rpl_ptr, size)
             }
         };
 

src/libkvmi.rs

@@ -97,15 +97,22 @@ type FnGetMaximumGFN = extern "C" fn(dom: *mut c_void, gfn: *mut c_ulonglong) ->
 
 #[derive(Debug)]
 pub struct Libkvmi {
+    #[allow(dead_code)]
     lib: Library,
     pub init_vsock: RawSymbol<FnInitVSock>,
     pub init_unix_socket: RawSymbol<FnInitUnixSocket>,
     pub uninit: RawSymbol<FnUninit>,
+    #[allow(dead_code)]
     pub close: RawSymbol<FnClose>,
+    #[allow(dead_code)]
     pub domain_close: RawSymbol<FnDomainClose>,
+    #[allow(dead_code)]
     pub domain_is_connected: RawSymbol<FnDomainIsConnected>,
+    #[allow(dead_code)]
     pub domain_name: RawSymbol<FnDomainName>,
+    #[allow(dead_code)]
     pub connection_fd: RawSymbol<FnConnectionFd>,
+    #[allow(dead_code)]
     pub get_version: RawSymbol<FnGetVersion>,
     pub control_events: RawSymbol<FnControlEvents>,
     pub control_cr: RawSymbol<FnControlCr>,
@@ -120,6 +127,7 @@ pub struct Libkvmi {
     pub reply_event: RawSymbol<FnReplyEvent>,
     pub pop_event: RawSymbol<FnPopEvent>,
     pub wait_event: RawSymbol<FnWaitEvent>,
+    #[allow(dead_code)]
     pub set_log_cb: RawSymbol<FnSetLogCb>,
     pub get_maximum_gfn: RawSymbol<FnGetMaximumGFN>,
 }