Revert the modification for supporting Serde on AArch64.

Some code for supporting Serde was introduced on AArch64. But the
support was incomplete, some errors are seen while building on ARM.
This commit reverts all Serde support for AArch64. So nothing is
different even if "with-serde" feature is enabled on ARM.
This is a workaround for build before Serde is ready on ARM.

Change-Id: Ia41857b1995d73d80df4fbf7cba9efb581a1abff
Signed-off-by: Michael Zhao <[email protected]>

Author: michael2012z

src/arm/mod.rs

@@ -25,51 +25,3 @@ pub mod bindings {
     ))]
     pub use super::bindings_v4_20_0::*;
 }
-
-#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
-#[cfg_attr(test, derive(Debug, PartialEq))]
-/// Composite version of the autogenerated bindings.
-pub struct Version {
-    /// Architecture.
-    pub arch: &'static str,
-    /// Kernel version.
-    pub kernel_ver: &'static str,
-    /// Crate version.
-    pub crate_ver: &'static str,
-}
-
-#[allow(unused)]
-static VERSION: Version = Version {
-    arch: "aarch",
-
-    #[cfg(feature = "kvm-v4_14_0")]
-    kernel_ver: "v4.14.0",
-    #[cfg(feature = "kvm-v4_20_0")]
-    kernel_ver: "v4.20.0",
-    #[cfg(all(not(feature = "kvm-v4_14_0"), not(feature = "kvm-v4_20_0")))]
-    kernel_ver: "v4.20.0",
-
-    crate_ver: env!("CARGO_PKG_VERSION"),
-};
-
-#[cfg(test)]
-mod tests {
-    #[cfg(feature = "with-serde")]
-    extern crate serde_json;
-
-    use super::{Version, VERSION};
-
-    #[test]
-    fn test_version() {
-        assert_eq!(VERSION.arch, "aarch");
-
-        #[cfg(feature = "kvm-v4_14_0")]
-        assert_eq!(VERSION.kernel_ver, "v4.14.0");
-        #[cfg(feature = "kvm-v4_20_0")]
-        assert_eq!(VERSION.kernel_ver, "v4.20.0");
-        #[cfg(all(not(feature = "kvm-v4_14_0"), not(feature = "kvm-v4_20_0")))]
-        assert_eq!(VERSION.kernel_ver, "v4.20.0");
-
-        assert_eq!(VERSION.crate_ver, env!("CARGO_PKG_VERSION"));
-    }
-}

src/arm64/mod.rs

@@ -25,51 +25,3 @@ pub mod bindings {
     ))]
     pub use super::bindings_v4_20_0::*;
 }
-
-#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
-#[cfg_attr(test, derive(Debug, PartialEq))]
-/// Composite version of the autogenerated bindings.
-pub struct Version {
-    /// Architecture.
-    pub arch: &'static str,
-    /// Kernel version.
-    pub kernel_ver: &'static str,
-    /// Crate version.
-    pub crate_ver: &'static str,
-}
-
-#[allow(unused)]
-static VERSION: Version = Version {
-    arch: "aarch64",
-
-    #[cfg(feature = "kvm-v4_14_0")]
-    kernel_ver: "v4.14.0",
-    #[cfg(feature = "kvm-v4_20_0")]
-    kernel_ver: "v4.20.0",
-    #[cfg(all(not(feature = "kvm-v4_14_0"), not(feature = "kvm-v4_20_0")))]
-    kernel_ver: "v4.20.0",
-
-    crate_ver: env!("CARGO_PKG_VERSION"),
-};
-
-#[cfg(test)]
-mod tests {
-    #[cfg(feature = "with-serde")]
-    extern crate serde_json;
-
-    use super::{Version, VERSION};
-
-    #[test]
-    fn test_version() {
-        assert_eq!(VERSION.arch, "aarch64");
-
-        #[cfg(feature = "kvm-v4_14_0")]
-        assert_eq!(VERSION.kernel_ver, "v4.14.0");
-        #[cfg(feature = "kvm-v4_20_0")]
-        assert_eq!(VERSION.kernel_ver, "v4.20.0");
-        #[cfg(all(not(feature = "kvm-v4_14_0"), not(feature = "kvm-v4_20_0")))]
-        assert_eq!(VERSION.kernel_ver, "v4.20.0");
-
-        assert_eq!(VERSION.crate_ver, env!("CARGO_PKG_VERSION"));
-    }
-}

src/lib.rs

@@ -29,15 +29,11 @@ pub use self::x86::Version;
 mod arm;
 #[cfg(target_arch = "aarch")]
 pub use self::arm::bindings::*;
-#[cfg(target_arch = "aarch")]
-pub use self::arm::Version;
 
 #[cfg(target_arch = "aarch64")]
 mod arm64;
 #[cfg(target_arch = "aarch64")]
 pub use self::arm64::bindings::*;
-#[cfg(target_arch = "aarch64")]
-pub use self::arm64::Version;
 
 #[cfg(all(test, feature = "with-serde"))]
 mod tests {