replace kvm_wrapper with kvm-bindings

The kvm_wrapper crate was deprecated in favor of kvm-bindings.

Signed-off-by: Andreea Florescu <[email protected]>

Author: andreeaflorescu

Cargo.lock

@@ -5,7 +5,7 @@ authors = ["The Chromium OS Authors"]
 
 [dependencies]
 byteorder = "=1.2.1"
-kvm_wrapper = ">=0.1.0"
+kvm-bindings = "0.1"
 libc = ">=0.2.39"
 
 arch_gen = { path = "../arch_gen" }

arch/Cargo.toml

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 extern crate byteorder;
-extern crate kvm_wrapper;
+extern crate kvm_bindings;
 extern crate libc;
 
 extern crate arch_gen;

arch/src/lib.rs

@@ -7,7 +7,7 @@
 
 // For GDT details see arch/x86/include/asm/segment.h
 
-use kvm_wrapper::kvm_segment;
+use kvm_bindings::kvm_segment;
 
 /// Constructor for a conventional segment GDT (or LDT) entry. Derived from the kernel's segment.h.
 pub fn gdt_entry(flags: u16, base: u32, limit: u32) -> u64 {

arch/src/x86_64/gdt.rs

@@ -12,7 +12,7 @@ use std::result;
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
 use kvm;
-use kvm_wrapper::kvm_lapic_state;
+use kvm_bindings::kvm_lapic_state;
 use sys_util;
 
 #[derive(Debug)]

arch/src/x86_64/interrupts.rs

@@ -10,7 +10,7 @@ use std::{mem, result};
 use super::gdt::{gdt_entry, kvm_segment_from_gdt};
 use arch_gen::x86::msr_index;
 use kvm::VcpuFd;
-use kvm_wrapper::{kvm_fpu, kvm_msr_entry, kvm_msrs, kvm_regs, kvm_sregs};
+use kvm_bindings::{kvm_fpu, kvm_msr_entry, kvm_msrs, kvm_regs, kvm_sregs};
 use memory_model::{GuestAddress, GuestMemory};
 use sys_util;
 

arch/src/x86_64/regs.rs

@@ -4,6 +4,6 @@ version = "0.1.0"
 authors = ["Amazon firecracker team <[email protected]>"]
 
 [dependencies]
-kvm_wrapper = ">=0.1.0"
+kvm-bindings = "0.1"
 
 kvm = { path = "../kvm" }

cpuid/Cargo.toml

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use cpu_leaf::*;
-use kvm_wrapper::kvm_cpuid_entry2;
+use kvm_bindings::kvm_cpuid_entry2;
 
 /// Sets up the cpuid entries for a given VCPU following a C3 template.
 pub fn set_cpuid_entries(entries: &mut [kvm_cpuid_entry2]) {

cpuid/src/c3_template.rs

@@ -9,7 +9,7 @@
 //! Utility for configuring the CPUID (CPU identification) for the guest microVM.
 
 extern crate kvm;
-extern crate kvm_wrapper;
+extern crate kvm_bindings;
 
 use std::result;
 
@@ -288,7 +288,7 @@ fn get_brand_string() -> PartialError<BrandString, brand_string::Error> {
 mod tests {
     use super::*;
     use kvm::{Kvm, MAX_KVM_CPUID_ENTRIES};
-    use kvm_wrapper::kvm_cpuid_entry2;
+    use kvm_bindings::kvm_cpuid_entry2;
 
     #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
     #[test]

cpuid/src/lib.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use cpu_leaf::*;
-use kvm_wrapper::kvm_cpuid_entry2;
+use kvm_bindings::kvm_cpuid_entry2;
 
 /// Sets up the cpuid entries for a given VCPU following a T2 template.
 pub fn set_cpuid_entries(entries: &mut [kvm_cpuid_entry2]) {