Implement Versionize for some unions.

- kvm_ioapic_state__bindgen_ty_1
- kvm_irqchip__bindgen_ty_1

Signed-off-by: Andrei Sandu <[email protected]>

Author: sandreim

src/x86/bindings_v4_20_0.rs

@@ -997,12 +997,45 @@ pub struct kvm_ioapic_state {
     pub redirtbl: [kvm_ioapic_state__bindgen_ty_1; 24usize],
 }
 #[repr(C)]
-#[derive(Copy, Clone, Versionize)]
+#[derive(Copy, Clone)]
 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,
 }
+
+// Manual implementation of `Versionize` since `versionize_derive` doesn't support unions
+// anymore. What we're doing here is equivalent to the old autogenerated implementation, namely
+// we're creating a bitwise serialization of the object.
+impl Versionize for kvm_ioapic_state__bindgen_ty_1 {
+    fn serialize<W: std::io::Write>(
+        &self,
+        writer: &mut W,
+        version_map: &VersionMap,
+        app_version: u16,
+    ) -> VersionizeResult<()> {
+        // Safe because this is a POD object and we're only using the read result to serialize
+        // the underlying bytes.
+        let bits = unsafe { self.bits };
+        assert_eq!(std::mem::size_of_val(&bits), std::mem::size_of::<Self>());
+        Versionize::serialize(&bits, writer, version_map, app_version)
+    }
+
+    fn deserialize<R: std::io::Read>(
+        reader: &mut R,
+        version_map: &VersionMap,
+        app_version: u16,
+    ) -> VersionizeResult<Self> {
+        let bits: __u64 = Versionize::deserialize(reader, version_map, app_version)?;
+        assert_eq!(std::mem::size_of_val(&bits), std::mem::size_of::<Self>());
+        Ok(Self { bits })
+    }
+
+    fn version() -> u16 {
+        1
+    }
+}
+
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone, PartialEq, Versionize)]
 pub struct kvm_ioapic_state__bindgen_ty_1__bindgen_ty_1 {
@@ -4221,13 +4254,61 @@ pub struct kvm_irqchip {
     pub chip: kvm_irqchip__bindgen_ty_1,
 }
 #[repr(C)]
-#[derive(Copy, Clone, Versionize)]
+#[derive(Copy, Clone)]
 pub union kvm_irqchip__bindgen_ty_1 {
     pub dummy: [::std::os::raw::c_char; 512usize],
     pub pic: kvm_pic_state,
     pub ioapic: kvm_ioapic_state,
     _bindgen_union_align: [u64; 64usize],
 }
+
+// Helper struct for the manual `Versionize` implementation below. This makes things easier,
+// because there's no default way of serializing larger arrays.
+#[repr(transparent)]
+#[derive(Versionize)]
+struct kvm_irqchip__bindgen_ty_1_dummy {
+    dummy: [::std::os::raw::c_char; 512usize],
+}
+
+impl kvm_irqchip__bindgen_ty_1_dummy {
+    fn new(dummy: [::std::os::raw::c_char; 512usize]) -> Self {
+        Self { dummy }
+    }
+}
+
+// Manual implementation of `Versionize` since `versionize_derive` doesn't support unions
+// anymore. What we're doing here is equivalent to the old autogenerated implementation, namely
+// we're creating a bitwise serialization of the object.
+impl Versionize for kvm_irqchip__bindgen_ty_1 {
+    fn serialize<W: std::io::Write>(
+        &self,
+        writer: &mut W,
+        version_map: &VersionMap,
+        app_version: u16,
+    ) -> VersionizeResult<()> {
+        // Safe because this is a POD struct and we're only using the read result to serialize
+        // the underlying bytes.
+        let dummy = kvm_irqchip__bindgen_ty_1_dummy::new(unsafe { self.dummy });
+        assert_eq!(std::mem::size_of_val(&dummy), std::mem::size_of::<Self>());
+        Versionize::serialize(&dummy, writer, version_map, app_version)
+    }
+
+    fn deserialize<R: std::io::Read>(
+        reader: &mut R,
+        version_map: &VersionMap,
+        app_version: u16,
+    ) -> VersionizeResult<Self> {
+        let dummy: kvm_irqchip__bindgen_ty_1_dummy =
+            Versionize::deserialize(reader, version_map, app_version)?;
+        assert_eq!(std::mem::size_of_val(&dummy), std::mem::size_of::<Self>());
+        Ok(Self { dummy: dummy.dummy })
+    }
+
+    fn version() -> u16 {
+        1
+    }
+}
+
 #[test]
 fn bindgen_test_layout_kvm_irqchip__bindgen_ty_1() {
     assert_eq!(