Require crossbeam-channel 0.5.15 or higher

src/devices/Cargo.toml

@@ -16,7 +16,7 @@ virgl_resource_map2 = []
 
 [dependencies]
 bitflags = "1.2.0"
-crossbeam-channel = "0.5"
+crossbeam-channel = ">=0.5.15"
 env_logger = "0.9.0"
 libc = ">=0.2.39"
 libloading = "0.8"

src/devices/src/legacy/hvfgicv3.rs

@@ -135,10 +135,9 @@ impl IrqChipT for HvfGicV3 {
         if let Some(irq_line) = irq_line {
             let ret = unsafe { (self.bindings.hv_gic_set_spi)(irq_line, true) };
             if ret != HV_SUCCESS {
-                Err(DeviceError::FailedSignalingUsedQueue(io::Error::new(
-                    io::ErrorKind::Other,
-                    "HVF returned error when setting SPI",
-                )))
+                Err(DeviceError::FailedSignalingUsedQueue(
+                    std::io::Error::other("HVF returned error when setting SPI"),
+                ))
             } else {
                 Ok(())
             }

src/devices/src/virtio/snd/mod.rs

@@ -1,6 +1,5 @@
 use std::{
     io::Error as IoError,
-    io::ErrorKind,
     sync::{atomic::AtomicUsize, Arc, Mutex},
 };
 
@@ -144,7 +143,7 @@ pub enum Error {
 
 impl From<Error> for IoError {
     fn from(e: Error) -> Self {
-        Self::new(ErrorKind::Other, e)
+        Self::other(e)
     }
 }
 

src/hvf/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["Sergio Lopez <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-crossbeam-channel = "0.5"
+crossbeam-channel = ">=0.5.15"
 libloading = "0.8"
 log = "0.4.0"
 env_logger = "0.9.0"
 
-arch = { path = "../arch" }
+arch = { path = "../arch" }

src/libkrun/Cargo.toml

@@ -16,7 +16,7 @@ snd = []
 virgl_resource_map2 = []
 
 [dependencies]
-crossbeam-channel = "0.5"
+crossbeam-channel = ">=0.5.15"
 env_logger = "0.9.0"
 libc = ">=0.2.39"
 libloading = "0.8"

src/utils/Cargo.toml

@@ -10,7 +10,7 @@ env_logger = "0.9.0"
 libc = ">=0.2.85"
 log = "0.4.0"
 vmm-sys-util = "0.12.1"
-crossbeam-channel = "0.5"
+crossbeam-channel = ">=0.5.15"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 kvm-bindings = { version = ">=0.10", features = ["fam-wrappers"] }

src/vmm/Cargo.toml

@@ -14,7 +14,7 @@ gpu = []
 snd = []
 
 [dependencies]
-crossbeam-channel = "0.5"
+crossbeam-channel = ">=0.5.15"
 env_logger = "0.9.0"
 flate2 = "1.0.35"
 libc = ">=0.2.39"

src/vmm/src/macos/vstate.rs

@@ -232,7 +232,7 @@ impl Vcpu {
         // _before_ running this, then there is nothing we can do.
         Self::TLS_VCPU_PTR.with(|cell: &VcpuCell| {
             if let Some(vcpu_ptr) = cell.get() {
-                if vcpu_ptr == self as *const Vcpu {
+                if std::ptr::eq(vcpu_ptr, self) {
                     Self::TLS_VCPU_PTR.with(|cell: &VcpuCell| cell.take());
                     return Ok(());
                 }