replace kvm_gen with kvm_wrapper

From kvm_wrapper we use the default feature which is generating
bindings from linux kernel version 4.20. We can always use the latest
version because the KVM interface is backwards compatible.

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

Author: andreeaflorescu

Cargo.lock

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

cpuid/Cargo.toml

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use cpu_leaf::*;
-use kvm_gen::kvm_cpuid_entry2;
+use kvm_wrapper::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_gen;
+extern crate kvm_wrapper;
 
 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_gen::kvm_cpuid_entry2;
+    use kvm_wrapper::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_gen::kvm_cpuid_entry2;
+use kvm_wrapper::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]) {

cpuid/src/t2_template.rs

@@ -4,9 +4,9 @@ version = "0.1.0"
 authors = ["The Chromium OS Authors"]
 
 [dependencies]
+kvm_wrapper = ">=0.1.0"
 libc = ">=0.2.39"
 
-kvm_gen = { path = "../kvm_gen" }
 memory_model = { path = "../memory_model" }
 sys_util = { path = "../sys_util" }
 

kvm/Cargo.toml

@@ -5,7 +5,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the THIRD-PARTY file.
 
-use kvm_gen::*;
+use kvm_wrapper::*;
 
 /// A capability the kernel's KVM interface can possibly expose.
 #[derive(Clone, Copy, Debug)]

kvm/src/cap.rs

@@ -1,7 +1,7 @@
 // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use kvm_gen::*;
+use kvm_wrapper::*;
 
 // Declares necessary ioctls specific to their platform.
 

kvm/src/ioctl_defs.rs

@@ -11,7 +11,7 @@
 
 extern crate libc;
 
-extern crate kvm_gen;
+extern crate kvm_wrapper;
 extern crate memory_model;
 #[macro_use]
 extern crate sys_util;
@@ -25,7 +25,7 @@ use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 
 use libc::{open, EINVAL, ENOSPC, O_RDWR};
 
-use kvm_gen::*;
+use kvm_wrapper::*;
 use memory_model::MemoryMapping;
 use sys_util::{errno_result, Error, EventFd, Result};
 use sys_util::{
@@ -34,7 +34,7 @@ use sys_util::{
 
 pub use cap::*;
 use ioctl_defs::*;
-pub use kvm_gen::KVM_API_VERSION;
+pub use kvm_wrapper::KVM_API_VERSION;
 
 /// Taken from Linux Kernel v4.14.13 (arch/x86/include/asm/kvm_host.h)
 pub const MAX_KVM_CPUID_ENTRIES: usize = 80;
@@ -1449,7 +1449,9 @@ mod tests {
                 .unwrap_err(),
             badf_error
         );
-        assert_eq!(faulty_vcpu_fd.get_lapic().unwrap_err(), badf_error);
+        // kvm_lapic_state does not implement debug by default so we cannot
+        // use unwrap_err here.
+        assert!(faulty_vcpu_fd.get_lapic().is_err());
         assert_eq!(
             faulty_vcpu_fd
                 .set_lapic(&unsafe { std::mem::zeroed() })