x86: add versioning for x86_64 state structs

Signed-off-by: Adrian Catangiu <[email protected]>

Author: acatangiu

Cargo.toml

@@ -15,3 +15,6 @@ fam-wrappers = ["vmm-sys-util"]
 
 [dependencies]
 vmm-sys-util = { version = ">=0.2.0", optional = true }
+
+versionize = { git = "https://github.com/firecracker-microvm/versionize", tag = "v0.1.0" }
+versionize_derive = { git = "https://github.com/firecracker-microvm/versionize_derive", tag = "v0.1.0" }

src/lib.rs

@@ -12,6 +12,9 @@
 ))]
 extern crate vmm_sys_util;
 
+extern crate versionize;
+extern crate versionize_derive;
+
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 mod x86;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]

src/x86/bindings_v4_20_0.rs

@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 /* automatically generated by rust-bindgen */
 
+use versionize::{VersionMap, Versionize, VersionizeResult};
+use versionize_derive::Versionize;
+
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct __BindgenBitfieldUnit<Storage, Align>
@@ -11,6 +14,35 @@ where
     storage: Storage,
     align: [Align; 0],
 }
+// Implementing Versionize by hand due to some weird errors when trying to derive (most likely
+// because versionize_derive does not support structs with generics at this point).
+impl<Storage, Align> Versionize for __BindgenBitfieldUnit<Storage, Align>
+where
+    Storage: AsRef<[u8]> + AsMut<[u8]> + Versionize,
+{
+    fn serialize<W: std::io::Write>(
+        &self,
+        writer: &mut W,
+        version_map: &VersionMap,
+        app_version: u16,
+    ) -> VersionizeResult<()> {
+        Versionize::serialize(&self.storage, writer, version_map, app_version)
+    }
+
+    fn deserialize<R: std::io::Read>(
+        reader: &mut R,
+        version_map: &VersionMap,
+        app_version: u16,
+    ) -> VersionizeResult<Self> {
+        let storage = Versionize::deserialize(reader, version_map, app_version)?;
+
+        Ok(__BindgenBitfieldUnit { storage, align: [] })
+    }
+
+    fn version() -> u16 {
+        1
+    }
+}
 impl<Storage, Align> __BindgenBitfieldUnit<Storage, Align>
 where
     Storage: AsRef<[u8]> + AsMut<[u8]>,
@@ -120,6 +152,31 @@ impl<T> ::std::clone::Clone for __IncompleteArrayField<T> {
         Self::new()
     }
 }
+impl<T> Versionize for __IncompleteArrayField<T> {
+    #[inline]
+    fn serialize<W: std::io::Write>(
+        &self,
+        _writer: &mut W,
+        _version_map: &VersionMap,
+        _app_version: u16,
+    ) -> VersionizeResult<()> {
+        Ok(())
+    }
+
+    #[inline]
+    fn deserialize<R: std::io::Read>(
+        _reader: &mut R,
+        _version_map: &VersionMap,
+        _app_version: u16,
+    ) -> VersionizeResult<Self> {
+        Ok(Self::new())
+    }
+
+    // Not used.
+    fn version() -> u16 {
+        1
+    }
+}
 pub const __BITS_PER_LONG: u32 = 64;
 pub const __FD_SETSIZE: u32 = 1024;
 pub const _IOC_NRBITS: u32 = 8;
@@ -733,7 +790,7 @@ fn bindgen_test_layout_kvm_memory_alias() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_pic_state {
     pub last_irr: __u8,
     pub irr: __u8,
@@ -930,7 +987,7 @@ fn bindgen_test_layout_kvm_pic_state() {
     );
 }
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Versionize)]
 pub struct kvm_ioapic_state {
     pub base_address: __u64,
     pub ioregsel: __u32,
@@ -940,14 +997,14 @@ pub struct kvm_ioapic_state {
     pub redirtbl: [kvm_ioapic_state__bindgen_ty_1; 24usize],
 }
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Versionize)]
 pub union kvm_ioapic_state__bindgen_ty_1 {
     pub bits: __u64,
     pub fields: kvm_ioapic_state__bindgen_ty_1__bindgen_ty_1,
     _bindgen_union_align: u64,
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_ioapic_state__bindgen_ty_1__bindgen_ty_1 {
     pub vector: __u8,
     pub _bitfield_1: __BindgenBitfieldUnit<[u8; 2usize], u8>,
@@ -1270,7 +1327,7 @@ impl Default for kvm_ioapic_state {
     }
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_regs {
     pub rax: __u64,
     pub rbx: __u64,
@@ -1485,7 +1542,7 @@ fn bindgen_test_layout_kvm_regs() {
     );
 }
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Versionize)]
 pub struct kvm_lapic_state {
     pub regs: [::std::os::raw::c_char; 1024usize],
 }
@@ -1518,7 +1575,7 @@ impl Default for kvm_lapic_state {
     }
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_segment {
     pub base: __u64,
     pub limit: __u32,
@@ -1678,7 +1735,7 @@ fn bindgen_test_layout_kvm_segment() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_dtable {
     pub base: __u64,
     pub limit: __u16,
@@ -1728,7 +1785,7 @@ fn bindgen_test_layout_kvm_dtable() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_sregs {
     pub cs: kvm_segment,
     pub ds: kvm_segment,
@@ -2081,7 +2138,7 @@ fn bindgen_test_layout_kvm_fpu() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_msr_entry {
     pub index: __u32,
     pub reserved: __u32,
@@ -2131,7 +2188,7 @@ fn bindgen_test_layout_kvm_msr_entry() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Versionize)]
 pub struct kvm_msrs {
     pub nmsrs: __u32,
     pub pad: __u32,
@@ -2353,7 +2410,7 @@ fn bindgen_test_layout_kvm_cpuid() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_cpuid_entry2 {
     pub function: __u32,
     pub index: __u32,
@@ -2458,7 +2515,7 @@ fn bindgen_test_layout_kvm_cpuid_entry2() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Versionize)]
 pub struct kvm_cpuid2 {
     pub nent: __u32,
     pub padding: __u32,
@@ -2508,7 +2565,7 @@ fn bindgen_test_layout_kvm_cpuid2() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_pit_channel_state {
     pub count: __u32,
     pub latched_count: __u16,
@@ -2810,7 +2867,7 @@ fn bindgen_test_layout_kvm_pit_state() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_pit_state2 {
     pub channels: [kvm_pit_channel_state; 3usize],
     pub flags: __u32,
@@ -2901,7 +2958,7 @@ fn bindgen_test_layout_kvm_reinject_control() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_vcpu_events {
     pub exception: kvm_vcpu_events__bindgen_ty_1,
     pub interrupt: kvm_vcpu_events__bindgen_ty_2,
@@ -2914,7 +2971,7 @@ pub struct kvm_vcpu_events {
     pub exception_payload: __u64,
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_vcpu_events__bindgen_ty_1 {
     pub injected: __u8,
     pub nr: __u8,
@@ -2998,7 +3055,7 @@ fn bindgen_test_layout_kvm_vcpu_events__bindgen_ty_1() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_vcpu_events__bindgen_ty_2 {
     pub injected: __u8,
     pub nr: __u8,
@@ -3067,7 +3124,7 @@ fn bindgen_test_layout_kvm_vcpu_events__bindgen_ty_2() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_vcpu_events__bindgen_ty_3 {
     pub injected: __u8,
     pub pending: __u8,
@@ -3136,7 +3193,7 @@ fn bindgen_test_layout_kvm_vcpu_events__bindgen_ty_3() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_vcpu_events__bindgen_ty_4 {
     pub smm: __u8,
     pub pending: __u8,
@@ -3314,7 +3371,7 @@ fn bindgen_test_layout_kvm_vcpu_events() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_debugregs {
     pub db: [__u64; 4usize],
     pub dr6: __u64,
@@ -3386,7 +3443,7 @@ fn bindgen_test_layout_kvm_debugregs() {
     );
 }
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Versionize)]
 pub struct kvm_xsave {
     pub region: [__u32; 1024usize],
 }
@@ -3419,7 +3476,7 @@ impl Default for kvm_xsave {
     }
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_xcr {
     pub xcr: __u32,
     pub reserved: __u32,
@@ -3469,7 +3526,7 @@ fn bindgen_test_layout_kvm_xcr() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_xcrs {
     pub nr_xcrs: __u32,
     pub flags: __u32,
@@ -4157,14 +4214,14 @@ impl Default for kvm_irq_level {
     }
 }
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Versionize)]
 pub struct kvm_irqchip {
     pub chip_id: __u32,
     pub pad: __u32,
     pub chip: kvm_irqchip__bindgen_ty_1,
 }
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Versionize)]
 pub union kvm_irqchip__bindgen_ty_1 {
     pub dummy: [::std::os::raw::c_char; 512usize],
     pub pic: kvm_pic_state,
@@ -7058,7 +7115,7 @@ fn bindgen_test_layout_kvm_vapic_addr() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_mp_state {
     pub mp_state: __u32,
 }
@@ -9121,7 +9178,7 @@ fn bindgen_test_layout_kvm_irqfd() {
     );
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_clock_data {
     pub clock: __u64,
     pub flags: __u32,