make code compilable

Author: aarkegz

Cargo.toml

@@ -33,11 +33,13 @@ axvcpu = "0.1.0"
 x86_vlapic = "0.1.0"
 axdevice_base = "0.1.0"
 axvisor_api = "0.1.0"
+tock-registers = "0.10"
 
 spin = { version = "0.9", default-features = false }
 
 [features]
-default = ["vmx"]
+default = ["svm"]
+# default = ["vmx"]
 tracing = []
 vmx = []
 svm = []

src/frame.rs

@@ -1,52 +1,40 @@
 #![no_std]
 #![feature(doc_cfg)]
 #![feature(concat_idents)]
-#![feature(naked_functions)]
 #![doc = include_str!("../README.md")]
 
 #[macro_use]
 extern crate log;
 
 extern crate alloc;
 
+#[cfg(test)]
+mod test_utils;
+
 pub(crate) mod msr;
 #[macro_use]
 pub(crate) mod regs;
 mod ept;
-mod frame;
+
+#[cfg(all(feature = "vmx", feature = "svm"))]
+compile_error!("Features 'vmx' and 'svm' are mutually exclusive. Please enable only one of them.");
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "vmx")] {
         mod vmx;
-        use vmx as vender;
-        pub use vmx::{VmxExitInfo, VmxExitReason, VmxInterruptInfo, VmxIoExitInfo};
-        pub use vender::VmxArchVCpu;
-        pub use vender::VmxArchPerCpuState;
-    }else if #[cfg(feature = "svm")] {
+        use vmx as vendor;
+        // pub use vmx::{VmxExitInfo, VmxExitReason, VmxInterruptInfo, VmxIoExitInfo};
+        pub use vendor::VmxArchVCpu as X86ArchVCpu;
+        pub use vendor::VmxArchPerCpuState as X86ArchPerCpuState;
+    } else if #[cfg(feature = "svm")] {
         mod svm;
-        use svm as vender;
-        pub use vender::{
-            SvmArchVCpu,SvmArchPerCpuState,
+        use svm as vendor;
+        pub use vendor::{
+            SvmArchVCpu as X86ArchVCpu, SvmArchPerCpuState as X86ArchPerCpuState,
         };
     }
 }
 
-//
-//         mod vmx;
-//         use vmx as vender;
-//         pub use vmx::{VmxExitInfo, VmxExitReason, VmxInterruptInfo, VmxIoExitInfo};
-//
-//         pub use vender::VmxArchVCpu;
-//         pub use vender::VmxArchPerCpuState;
-//
-//
-// mod svm;
-// use svm as vendor;
-// pub use vendor::{
-//     SvmArchVCpu,
-//     SvmArchPerCpuState,
-// };
-
 pub use ept::GuestPageWalkInfo;
 pub use regs::GeneralRegisters;
-pub use vender::has_hardware_support;
+pub use vendor::has_hardware_support;