Make room for arch64 target

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>

Author: mxpv

hv-sys/wrapper.h

@@ -1,2 +1,11 @@
+#if defined(__arm64__)
+
+// Newer version of Hypervisor.Framework (the ones with ARM support) includes more convenient `Hypervisor.h`
+#include "Hypervisor/Hypervisor.h"
+
+#elif defined(__x86_64__)
+
 #include "Hypervisor/hv.h"
 #include "Hypervisor/hv_vmx.h"
+
+#endif

hv/examples/caps.rs

@@ -1,14 +1,13 @@
+use hv::x86::{Capability, VmExt, VmOptions};
+
 fn main() -> Result<(), hv::Error> {
-    hv::Vm::create(hv::VmOptions::default())?;
+    hv::Vm::create(VmOptions::default())?;
 
-    println!(
-        "Max vCPUs: {}",
-        hv::Vm::capability(hv::Capability::VCPU_MAX)?
-    );
+    println!("Max vCPUs: {}", hv::Vm::capability(Capability::VcpuMax)?);
 
     println!(
         "Available address spaces: {}",
-        hv::Vm::capability(hv::Capability::ADDR_SPAC_EMAX)?
+        hv::Vm::capability(Capability::AddrSpaceMax)?
     );
 
     hv::Vm::destroy()?;

hv/src/lib.rs

@@ -5,12 +5,14 @@ use std::fmt;
 
 /// Low level access to generated bindings.
 pub use hv_sys as sys;
+pub use vcpu::Vcpu;
+pub use vm::Vm;
 
 mod vcpu;
-pub mod vmx;
-pub mod x86;
+pub mod vm;
 
-pub use vcpu::Vcpu;
+#[cfg(target_arch = "x86_64")]
+pub mod x86;
 
 /// Helper macro to call unsafe Hypervisor functions and map returned error codes to [Error] type.
 #[macro_export]
@@ -24,182 +26,6 @@ macro_rules! call {
     }};
 }
 
-bitflags::bitflags! {
-    /// The type of system capabilities.
-    pub struct Capability: u32 {
-        const VCPU_MAX = sys::HV_CAP_VCPUMAX;
-        const ADDR_SPAC_EMAX = sys::HV_CAP_ADDRSPACEMAX;
-    }
-}
-
-/// Type of a user virtual address.
-pub type UVAddr = sys::hv_uvaddr_t;
-
-/// Type of a guest physical address.
-pub type GPAddr = sys::hv_gpaddr_t;
-
-/// Type of a guest address space.
-pub type Space = sys::hv_vm_space_t;
-
-pub const VM_SPACE_DEFAULT: Space = sys::HV_VM_SPACE_DEFAULT;
-
-bitflags::bitflags! {
-    /// Guest physical memory region permissions.
-    pub struct Memory: u32 {
-        const READ = sys::HV_MEMORY_READ;
-        const WRITE = sys::HV_MEMORY_WRITE;
-        const EXEC = sys::HV_MEMORY_EXEC;
-    }
-}
-
-bitflags::bitflags! {
-    pub struct VmOptions: u64 {
-        const DEFAULT = sys::HV_VM_DEFAULT as _;
-        const SPECIFY_MITIGATIONS = sys::HV_VM_SPECIFY_MITIGATIONS as _;
-        const MITIGATION_A_ENABLE = sys::HV_VM_MITIGATION_A_ENABLE as _;
-        const MITIGATION_B_ENABLE = sys::HV_VM_MITIGATION_B_ENABLE as _;
-        const MITIGATION_C_ENABLE = sys::HV_VM_MITIGATION_C_ENABLE as _;
-        const MITIGATION_D_ENABLE = sys::HV_VM_MITIGATION_D_ENABLE as _;
-        const MITIGATION_E_ENABLE = sys::HV_VM_MITIGATION_E_ENABLE as _;
-    }
-}
-
-impl Default for VmOptions {
-    fn default() -> Self {
-        VmOptions::DEFAULT
-    }
-}
-
-/// Vm is an entry point to Hypervisor Framework.
-#[derive(Debug)]
-pub struct Vm;
-
-impl Vm {
-    /// Creates a VM instance for the current process.
-    pub fn create(options: VmOptions) -> Result<(), Error> {
-        call!(sys::hv_vm_create(options.bits))
-    }
-
-    /// Gets the value of capabilities of the system.
-    pub fn capability(cap: Capability) -> Result<u64, Error> {
-        let mut out = 0_u64;
-        call!(sys::hv_capability(cap.bits as u64, &mut out))?;
-        Ok(out)
-    }
-
-    /// Creates an additional guest address space for the current task.
-    #[cfg(feature = "hv_10_15")]
-    pub fn space_create() -> Result<Space, Error> {
-        let mut space: Space = 0;
-        call!(sys::hv_vm_space_create(&mut space))?;
-        Ok(space)
-    }
-
-    /// Destroys the address space instance associated with the current task.
-    ///
-    /// # Arguments
-    /// * `asid` - Address space ID
-    #[cfg(feature = "hv_10_15")]
-    pub fn space_destroy(asid: Space) -> Result<(), Error> {
-        call!(sys::hv_vm_space_destroy(asid))
-    }
-
-    /// Maps a region in the virtual address space of the current task into the guest physical
-    /// address space of the VM.
-    ///
-    /// # Arguments
-    /// * `uva` - Page aligned virtual address in the current task.
-    /// * `gpa` - Page aligned address in the guest physical address space.
-    /// * `size` - Size in bytes of the region to be mapped.
-    /// * `flags` - READ, WRITE and EXECUTE permissions of the region
-    pub fn map(uva: UVAddr, gpa: GPAddr, size: u64, flags: Memory) -> Result<(), Error> {
-        call!(sys::hv_vm_map(uva, gpa, size, flags.bits.into()))
-    }
-
-    /// Unmaps a region in the guest physical address space of the VM
-    ///
-    /// # Arguments
-    /// * `gpa` - Page aligned address in the guest physical address space.
-    /// * `size` - Size in bytes of the region to be unmapped.
-    pub fn unmap(gpa: GPAddr, size: u64) -> Result<(), Error> {
-        call!(sys::hv_vm_unmap(gpa, size))
-    }
-
-    /// Modifies the permissions of a region in the guest physical address space of the VM.
-    ///
-    /// # Arguments
-    /// * `gpa` - Page aligned address in the guest physical address space.
-    /// * `size` - Size in bytes of the region to be modified.
-    /// * `flags` - New READ, WRITE and EXECUTE permissions of the region.
-    pub fn protect(gpa: GPAddr, size: u64, flags: Memory) -> Result<(), Error> {
-        call!(sys::hv_vm_protect(gpa, size, flags.bits.into()))
-    }
-
-    /// Maps a region in the virtual address space of the current task
-    /// into a guest physical address space of the VM.
-    ///
-    /// # Arguments
-    /// * `asid` - Address space ID.
-    /// * `uva` - Page aligned virtual address in the current task.
-    /// * `gpa` - Page aligned address in the guest physical address space.
-    /// * `size` - Size in bytes of the region to be mapped.
-    /// * `flags` - READ, WRITE and EXECUTE permissions of the region.
-    #[cfg(feature = "hv_10_15")]
-    pub fn map_space(
-        asid: Space,
-        uva: UVAddr,
-        gpa: GPAddr,
-        size: u64,
-        flags: Memory,
-    ) -> Result<(), Error> {
-        call!(sys::hv_vm_map_space(
-            asid,
-            uva,
-            gpa,
-            size,
-            flags.bits.into()
-        ))
-    }
-
-    /// Unmaps a region in a guest physical address space of the VM.
-    ///
-    /// # Arguments
-    /// * `asid` - Address space ID.
-    /// * `gpa` - Page aligned address in the guest physical address space.
-    /// * `size` - Size in bytes of the region to be unmapped.
-    #[cfg(feature = "hv_10_15")]
-    pub fn unmap_space(asid: Space, gpa: GPAddr, size: u64) -> Result<(), Error> {
-        call!(sys::hv_vm_unmap_space(asid, gpa, size))
-    }
-
-    /// Modifies the permissions of a region in a guest physical address space of the VM.
-    ///
-    /// # Arguments
-    /// * `asid` - Address space ID.
-    /// * `gpa` - Page aligned address in the guest physical address space.
-    /// * `size` - Size in bytes of the region to be modified.
-    /// * `flags` - New READ, WRITE and EXECUTE permissions of the region.
-    #[cfg(feature = "hv_10_15")]
-    pub fn protect_space(asid: Space, gpa: GPAddr, size: u64, flags: Memory) -> Result<(), Error> {
-        call!(sys::hv_vm_protect_space(asid, gpa, size, flags.bits.into()))
-    }
-
-    /// Synchronizes guest TSC across all vCPUs.
-    pub fn sync_tsc(tcs: u64) -> Result<(), Error> {
-        call!(sys::hv_vm_sync_tsc(tcs))
-    }
-
-    /// Creates a vCPU instance for the current thread.
-    pub fn create_cpu() -> Result<Vcpu, Error> {
-        Vcpu::new()
-    }
-
-    /// Destroys the VM instance associated with the current process.
-    pub fn destroy() -> Result<(), Error> {
-        call!(sys::hv_vm_destroy())
-    }
-}
-
 /// The return type of framework functions.
 /// Wraps the underlying `hv_return_t` type.
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]