Merge branch 'main' into main

Author: davidkleymann

.buildkite/custom-tests.json

@@ -1,38 +1,3 @@
 {
-    "tests": [
-        {
-            "test_name": "build-fam-gnu",
-            "command": "cargo build --release --features=fam-wrappers",
-            "platform": [
-                "x86_64",
-                "aarch64",
-                "riscv64"
-            ]
-        },
-        {
-            "test_name": "build-fam-musl",
-            "command": "cargo build --release --features=fam-wrappers --target {target_platform}-unknown-linux-musl",
-            "platform": [
-                "x86_64",
-                "aarch64"
-            ]
-        },
-        {
-            "test_name": "build-serde-gnu",
-            "command": "cargo build --release --features=serde",
-            "platform": [
-                "x86_64",
-                "aarch64",
-                "riscv64"
-            ]
-        },
-        {
-            "test_name": "build-serde-musl",
-            "command": "cargo build --release --features=serde --target {target_platform}-unknown-linux-musl",
-            "platform": [
-                "x86_64",
-                "aarch64"
-            ]
-        }
-    ]
+    "tests": []
 }

kvm-bindings/src/arm64/fam_wrappers.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
+use vmm_sys_util::generate_fam_struct_impl;
 
 use super::bindings::*;
 

kvm-bindings/src/lib.rs

@@ -9,18 +9,6 @@
 #![deny(clippy::undocumented_unsafe_blocks)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
-#[cfg(feature = "fam-wrappers")]
-#[macro_use]
-extern crate vmm_sys_util;
-
-#[cfg(feature = "serde")]
-extern crate serde;
-
-#[cfg(feature = "serde")]
-extern crate zerocopy;
-
-extern crate core;
-
 #[cfg(feature = "serde")]
 #[macro_use]
 mod serialize;

kvm-bindings/src/riscv64/fam_wrappers.rs

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
+use vmm_sys_util::generate_fam_struct_impl;
 
 use super::bindings::*;
 

kvm-bindings/src/x86_64/fam_wrappers.rs

@@ -1,9 +1,9 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
-
 use super::bindings::*;
+use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
+use vmm_sys_util::generate_fam_struct_impl;
 
 /// Maximum number of CPUID entries that can be returned by a call to KVM ioctls.
 ///
@@ -192,7 +192,7 @@ unsafe impl FamStruct for kvm_xsave2 {
 /// cannot happen in the [`FamStruct::len`] trait method. To work around this, we define a wrapper
 /// struct that caches the length of a previous `KVM_CHECK_EXTENSION(KVM_CAP_XSAVE2)` call,
 /// and implement [`FamStruct`] for this wrapper. Then in kvm-ioctls, we can expose a function
-/// that first queries `KVM_CAP_XSAVE2`, then invokes [`KVM_GET_XSAVE2`] to retrieves the
+/// that first queries `KVM_CAP_XSAVE2`, then invokes `KVM_GET_XSAVE2` to retrieves the
 /// `kvm_xsave` structure, and finally combine them into the [`kvm_xsave2`] helper structure to be
 /// managed as a `FamStruct`.
 pub type Xsave = FamStructWrapper<kvm_xsave2>;

kvm-bindings/src/x86_64/serialize.rs

@@ -9,6 +9,7 @@ use super::bindings::{
     kvm_nested_state__bindgen_ty_1, kvm_pit_channel_state, kvm_pit_state2, kvm_regs, kvm_segment,
     kvm_sregs, kvm_vcpu_events, kvm_xcr, kvm_xcrs, kvm_xsave,
 };
+#[cfg(feature = "fam-wrappers")]
 use super::fam_wrappers::kvm_xsave2;
 use super::nested::{KvmNestedStateBuffer, kvm_nested_state__data};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -33,13 +34,15 @@ serde_impls!(
     kvm_msrs,
     kvm_cpuid2,
     kvm_xsave,
-    kvm_xsave2,
     kvm_irqchip,
     kvm_irq_routing,
     kvm_irq_routing_entry,
     KvmNestedStateBuffer
 );
 
+#[cfg(feature = "fam-wrappers")]
+serde_impls!(kvm_xsave2);
+
 // SAFETY: zerocopy's derives explicitly disallow deriving for unions where
 // the fields have different sizes, due to the smaller fields having padding.
 // Miri however does not complain about these implementations (e.g. about
@@ -200,6 +203,7 @@ mod tests {
         is_serde::<kvm_vcpu_events>();
         is_serde::<kvm_debugregs>();
         is_serde::<kvm_xsave>();
+        #[cfg(feature = "fam-wrappers")]
         is_serde::<kvm_xsave2>();
         is_serde::<kvm_xcr>();
         is_serde::<kvm_xcrs>();
@@ -235,6 +239,7 @@ mod tests {
         is_serde_json::<kvm_vcpu_events>();
         is_serde_json::<kvm_debugregs>();
         is_serde_json::<kvm_xsave>();
+        #[cfg(feature = "fam-wrappers")]
         is_serde_json::<kvm_xsave2>();
         is_serde_json::<kvm_xcr>();
         is_serde_json::<kvm_xcrs>();

kvm-ioctls/src/ioctls/device.rs

@@ -45,14 +45,12 @@ impl DeviceFd {
     ///
     /// Configuring a VFIO device using `set_device_attr`. Note that VFIO
     /// devices are not yet available on RISC-V The patch for QEMU:
-    /// https://lore.kernel.org/all/[email protected]/
+    /// <https://lore.kernel.org/all/[email protected]/>
     /// and patch for linux kernel
-    /// https://github.com/ventanamicro/linux/tree/dev-upstream are both not
+    /// <https://github.com/ventanamicro/linux/tree/dev-upstream> are both not
     /// upstreamed. Disabling VFIO device test for RISC-V at the time being.
     ///
     /// ```rust
-    /// # extern crate kvm_ioctls;
-    /// # extern crate kvm_bindings;
     /// # use kvm_ioctls::Kvm;
     /// let kvm = Kvm::new().unwrap();
     /// let vm = kvm.create_vm().unwrap();
@@ -124,8 +122,6 @@ impl DeviceFd {
     /// Getting the number of IRQs for a GICv2 device on an aarch64 platform
     ///
     /// ```rust
-    /// # extern crate kvm_ioctls;
-    /// # extern crate kvm_bindings;
     /// # use kvm_ioctls::Kvm;
     /// let kvm = Kvm::new().unwrap();
     /// let vm = kvm.create_vm().unwrap();