Update kvm-ioctls, kvm-bindings, vmm-sys-util, event-manager

The following crates have been updated to a newer version
kvm-ioctls 0.13.0
kvm-bindings 0.6
vmm-sys-util 0.11.2
event-manager 0.3.0

Signed-off-by: Alvise Rigo <a.rigo@virtualopensystems.com>
Reviewed-by: Timos Ampelikiotis <t.ampelikiotis@virtualopensystems.com>

Author: arigo-vos

Cargo.lock

@@ -6,14 +6,14 @@ edition = "2018"
 license = "Apache-2.0 OR BSD-3-Clause"
 
 [dependencies]
-event-manager = { version = "0.2.1", features = ["remote_endpoint"] }
-kvm-ioctls = "0.11.0"
+event-manager = { version = "0.3.0", features = ["remote_endpoint"] }
+kvm-ioctls = "0.13.0"
 libc = "0.2.76"
 linux-loader = "0.4.0"
 log = "0.4.6"
 vm-memory = "0.7.0"
 vm-superio = "0.5.0"
-vmm-sys-util = "0.8.0"
+vmm-sys-util = "0.11.2"
 vm-device = "0.1.0"
 
 virtio-blk = { git = "https://github.com/rust-vmm/vm-virtio.git", features = ["backend-stdio"] }
@@ -24,4 +24,4 @@ utils = { path = "../utils" }
 
 [dev-dependencies]
 vm-memory = { version = "0.7.0", features = ["backend-mmap"] }
-kvm-bindings = "0.5.0"
+kvm-bindings = "0.6.0"

src/devices/Cargo.toml

@@ -14,7 +14,7 @@ use std::os::raw::{c_char, c_int, c_uint, c_ulong};
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 
 use vmm_sys_util::ioctl::{ioctl_with_mut_ref, ioctl_with_ref, ioctl_with_val};
-use vmm_sys_util::{ioctl_expr, ioctl_ioc_nr, ioctl_iow_nr};
+use vmm_sys_util::{ioctl_ioc_nr, ioctl_iow_nr};
 
 use super::bindings::ifreq;
 

src/devices/src/virtio/net/tap.rs

@@ -11,11 +11,11 @@ keywords = ["virt", "kvm", "vm"]
 
 [dependencies]
 thiserror = "1.0.30"
-kvm-ioctls = { version = "0.11.0" }
-kvm-bindings = { version = "0.5.0", features = ["fam-wrappers"] }
+kvm-ioctls = "0.13.0"
+kvm-bindings = { version = "0.6.0", features = ["fam-wrappers"] }
 vm-memory = "0.7.0"
 libc = "0.2.76"
 
 [dev-dependencies]
 vm-memory = { version = "0.7.0", features = ["backend-mmap"] }
-vmm-sys-util = "0.8.0"
+vmm-sys-util = "0.11.2"

src/vm-vcpu-ref/Cargo.toml

@@ -9,10 +9,10 @@ edition = "2018"
 [dependencies]
 thiserror = "1.0.30"
 libc = "0.2.76"
-kvm-bindings = { version = "0.5.0", features = ["fam-wrappers"] }
-kvm-ioctls = "0.11.0"
+kvm-bindings = { version = "0.6.0", features = ["fam-wrappers"] }
+kvm-ioctls = "0.13.0"
 vm-memory = "0.7.0"
-vmm-sys-util = ">=0.8.0"
+vmm-sys-util = "0.11.2"
 vm-device = "0.1.0"
 
 utils = { path = "../utils" }

src/vm-vcpu/Cargo.toml

@@ -412,7 +412,7 @@ impl KvmVcpu {
     fn set_state(&mut self, state: VcpuState) -> Result<()> {
         for reg in state.regs {
             self.vcpu_fd
-                .set_one_reg(reg.id, reg.addr)
+                .set_one_reg(reg.id, reg.addr as u128)
                 .map_err(Error::VcpuSetReg)?;
         }
 
@@ -458,7 +458,7 @@ impl KvmVcpu {
         data = (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT | PSR_MODE_EL1h).into();
         reg_id = arm64_core_reg!(pstate);
         self.vcpu_fd
-            .set_one_reg(reg_id, data)
+            .set_one_reg(reg_id, data as u128)
             .map_err(Error::VcpuSetReg)?;
 
         // Other cpus are powered off initially
@@ -470,7 +470,7 @@ impl KvmVcpu {
             // hack -- can't get this to do offsetof(regs[0]) but luckily it's at offset 0
             reg_id = arm64_core_reg!(regs);
             self.vcpu_fd
-                .set_one_reg(reg_id, data)
+                .set_one_reg(reg_id, data as u128)
                 .map_err(Error::VcpuSetReg)?;
         }
 
@@ -682,7 +682,7 @@ impl KvmVcpu {
                 let data = ip.0;
                 let reg_id = arm64_core_reg!(pc);
                 self.vcpu_fd
-                    .set_one_reg(reg_id, data)
+                    .set_one_reg(reg_id, data as u128)
                     .map_err(Error::VcpuSetReg)?;
             }
         }

src/vm-vcpu/src/vcpu/mod.rs

@@ -1,5 +1,6 @@
 use kvm_bindings::*;
 use kvm_ioctls::VcpuFd;
+use std::convert::TryInto;
 
 use super::Error;
 
@@ -60,7 +61,10 @@ pub fn get_regs_and_mpidr(vcpu_fd: &VcpuFd) -> Result<(Vec<kvm_one_reg>, u64), E
     let mut regs = Vec::with_capacity(reg_id_list.as_slice().len());
     for &id in reg_id_list.as_slice() {
         let addr = vcpu_fd.get_one_reg(id).map_err(Error::VcpuGetReg)?;
-        regs.push(kvm_one_reg { id, addr });
+        regs.push(kvm_one_reg {
+            id,
+            addr: addr.try_into().unwrap(),
+        });
 
         if id == MPIDR_EL1 {
             mpidr = Some(addr);
@@ -72,5 +76,5 @@ pub fn get_regs_and_mpidr(vcpu_fd: &VcpuFd) -> Result<(Vec<kvm_one_reg>, u64), E
     }
 
     // unwrap() is safe because of the is_none() check above
-    Ok((regs, mpidr.unwrap()))
+    Ok((regs, mpidr.unwrap().try_into().unwrap()))
 }

src/vm-vcpu/src/vcpu/regs.rs

@@ -5,15 +5,15 @@ authors = ["rust-vmm AWS maintainers <rust-vmm-maintainers@amazon.com>"]
 edition = "2018"
 
 [dependencies]
-event-manager = "0.2.1"
-kvm-bindings = { version = "0.5.0", features = ["fam-wrappers"] }
-kvm-ioctls = "0.11.0"
+event-manager = "0.3.0"
+kvm-bindings = { version = "0.6.0", features = ["fam-wrappers"] }
+kvm-ioctls = "0.13.0"
 libc = "0.2.91"
 linux-loader = { version = "0.4.0", features = ["bzimage", "elf"] }
 vm-allocator = "0.1.0"
 vm-memory = { version = "0.7.0", features = ["backend-mmap"] }
 vm-superio = "0.5.0"
-vmm-sys-util = "0.8.0"
+vmm-sys-util = "0.11.2"
 vm-device = "0.1.0"
 
 devices = { path = "../devices" }