Upgrade to version 2021

Signed-off-by: Nguyen Dinh Phi <[email protected]>

Author: ita93

Cargo.toml

@@ -7,6 +7,7 @@ repository = "https://github.com/rust-vmm/kvm-ioctls"
 readme = "README.md"
 keywords = ["kvm"]
 license = "Apache-2.0 OR MIT"
+edition = "2021"
 
 [dependencies]
 libc = "0.2.39"

src/ioctls/device.rs

@@ -4,9 +4,9 @@
 use std::fs::File;
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 
-use ioctls::Result;
+use crate::ioctls::Result;
+use crate::kvm_ioctls::{KVM_GET_DEVICE_ATTR, KVM_HAS_DEVICE_ATTR, KVM_SET_DEVICE_ATTR};
 use kvm_bindings::kvm_device_attr;
-use kvm_ioctls::{KVM_GET_DEVICE_ATTR, KVM_HAS_DEVICE_ATTR, KVM_SET_DEVICE_ATTR};
 use vmm_sys_util::errno;
 use vmm_sys_util::ioctl::{ioctl_with_mut_ref, ioctl_with_ref};
 
@@ -178,7 +178,7 @@ impl FromRawFd for DeviceFd {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use ioctls::system::Kvm;
+    use crate::ioctls::system::Kvm;
     #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
     use kvm_bindings::{
         kvm_device_type_KVM_DEV_TYPE_ARM_VGIC_V3, kvm_device_type_KVM_DEV_TYPE_VFIO,
@@ -238,7 +238,7 @@ mod tests {
     #[test]
     #[cfg(target_arch = "aarch64")]
     fn test_create_device() {
-        use ioctls::vm::{create_gic_device, set_supported_nr_irqs};
+        use crate::ioctls::vm::{create_gic_device, set_supported_nr_irqs};
         use kvm_bindings::{
             kvm_device_type_KVM_DEV_TYPE_FSL_MPIC_20, KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
         };

src/ioctls/system.rs

@@ -9,14 +9,14 @@ use std::fs::File;
 use std::os::raw::{c_char, c_ulong};
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 
-use cap::Cap;
-use ioctls::vm::{new_vmfd, VmFd};
-use ioctls::Result;
+use crate::cap::Cap;
+use crate::ioctls::vm::{new_vmfd, VmFd};
+use crate::ioctls::Result;
+use crate::kvm_ioctls::*;
 #[cfg(any(target_arch = "aarch64"))]
 use kvm_bindings::KVM_VM_TYPE_ARM_IPA_SIZE_MASK;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use kvm_bindings::{CpuId, MsrList, KVM_MAX_CPUID_ENTRIES, KVM_MAX_MSR_ENTRIES};
-use kvm_ioctls::*;
 use vmm_sys_util::errno;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use vmm_sys_util::ioctl::ioctl_with_mut_ptr;

src/ioctls/vcpu.rs

@@ -10,10 +10,10 @@ use libc::EINVAL;
 use std::fs::File;
 use std::os::unix::io::{AsRawFd, RawFd};
 
-use ioctls::{KvmRunWrapper, Result};
+use crate::ioctls::{KvmRunWrapper, Result};
+use crate::kvm_ioctls::*;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use kvm_bindings::{CpuId, Msrs, KVM_MAX_CPUID_ENTRIES};
-use kvm_ioctls::*;
 use vmm_sys_util::errno;
 use vmm_sys_util::ioctl::{ioctl, ioctl_with_mut_ref, ioctl_with_ref};
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
@@ -1696,14 +1696,14 @@ mod tests {
     extern crate byteorder;
 
     use super::*;
-    use ioctls::system::Kvm;
     #[cfg(any(
         target_arch = "x86",
         target_arch = "x86_64",
         target_arch = "arm",
         target_arch = "aarch64"
     ))]
-    use Cap;
+    use crate::cap::Cap;
+    use crate::ioctls::system::Kvm;
 
     // Helper function for memory mapping `size` bytes of anonymous memory.
     // Panics if the mmap fails.

src/ioctls/vm.rs

@@ -11,13 +11,13 @@ use std::os::raw::c_void;
 use std::os::raw::{c_int, c_ulong};
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 
-use cap::Cap;
-use ioctls::device::new_device;
-use ioctls::device::DeviceFd;
-use ioctls::vcpu::new_vcpu;
-use ioctls::vcpu::VcpuFd;
-use ioctls::{KvmRunWrapper, Result};
-use kvm_ioctls::*;
+use crate::cap::Cap;
+use crate::ioctls::device::new_device;
+use crate::ioctls::device::DeviceFd;
+use crate::ioctls::vcpu::new_vcpu;
+use crate::ioctls::vcpu::VcpuFd;
+use crate::ioctls::{KvmRunWrapper, Result};
+use crate::kvm_ioctls::*;
 use vmm_sys_util::errno;
 use vmm_sys_util::eventfd::EventFd;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
@@ -1649,7 +1649,7 @@ pub(crate) fn request_gic_init(vgic: &DeviceFd) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use Kvm;
+    use crate::Kvm;
 
     #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
     use std::{fs::OpenOptions, ptr::null_mut};