Add hv_10_15 feature level

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

Author: mxpv

hv/Cargo.toml

@@ -10,3 +10,7 @@ readme = "../README.md"
 
 [dependencies]
 hv-sys = { path = "../hv-sys", version = "0.1.0" }
+
+[features]
+hv_10_15 = []
+default = ["hv_10_15"]

hv/src/lib.rs

@@ -67,6 +67,7 @@ pub fn capability(cap: Capability) -> Result<u64, Error> {
 }
 
 /// Creates an additional guest address space for the current task.
+#[cfg(feature = "hv_10_15")]
 pub fn vm_space_create() -> Result<Space, Error> {
     let mut space: Space = 0;
     call!(sys::hv_vm_space_create(&mut space))?;
@@ -77,6 +78,7 @@ pub fn vm_space_create() -> Result<Space, Error> {
 ///
 /// # Arguments
 /// * `asid` - Address space ID
+#[cfg(feature = "hv_10_15")]
 pub fn vm_space_destroy(asid: Space) -> Result<(), Error> {
     call!(sys::hv_vm_space_destroy(asid))
 }
@@ -130,6 +132,7 @@ pub fn vm_protect(gpa: GPAddr, size: u64, flags: Memory) -> Result<(), Error> {
 /// * `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 vm_map_space(
     asid: Space,
     uva: UVAddr,
@@ -152,6 +155,7 @@ pub fn vm_map_space(
 /// * `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 vm_unmap_space(asid: Space, gpa: GPAddr, size: u64) -> Result<(), Error> {
     call!(sys::hv_vm_unmap_space(asid, gpa, size))
 }
@@ -163,6 +167,7 @@ pub fn vm_unmap_space(asid: Space, gpa: GPAddr, size: u64) -> Result<(), Error>
 /// * `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 vm_protect_space(asid: Space, gpa: GPAddr, size: u64, flags: Memory) -> Result<(), Error> {
     call!(sys::hv_vm_protect_space(
         asid,

hv/src/vcpu.rs

@@ -1,8 +1,7 @@
 use std::ffi::c_void;
 use std::mem;
 
-use crate::{call, sys, Error};
-use crate::{vmx, x86};
+use crate::{call, sys, vmx, x86, Error, Space};
 
 /// Represents a single virtual CPU.
 ///
@@ -18,6 +17,12 @@ impl Vcpu {
         Ok(Vcpu(handle))
     }
 
+    /// Associates the vCPU instance with an allocated address space.
+    #[cfg(feature = "hv_10_15")]
+    pub fn set_space(&self, asid: Space) -> Result<(), Error> {
+        call!(sys::hv_vcpu_set_space(self.0, asid))
+    }
+
     /// Forces flushing of cached vCPU state.
     pub fn flush(&self) -> Result<(), Error> {
         call!(sys::hv_vcpu_flush(self.0))
@@ -34,6 +39,7 @@ impl Vcpu {
     }
 
     /// Executes a vCPU until the given deadline.
+    #[cfg(feature = "hv_10_15")]
     pub fn run_until(&self, deadline: u64) -> Result<(), Error> {
         call!(sys::hv_vcpu_run_until(self.0, deadline))
     }
@@ -130,14 +136,26 @@ impl vmx::VcpuExt for Vcpu {
     }
 
     /// Returns the current value of a shadow VMCS field of a vCPU.
+    #[cfg(feature = "hv_10_15")]
     fn read_shadow_vmcs(&self, field: u32) -> Result<u64, Error> {
         let mut out = 0_u64;
         call!(sys::hv_vmx_vcpu_read_shadow_vmcs(self.0, field, &mut out))?;
         Ok(out)
     }
 
     /// Set the value of a shadow VMCS field of a vCPU.
+    #[cfg(feature = "hv_10_15")]
     fn write_shadow_vmcs(&self, field: u32, value: u64) -> Result<(), Error> {
         call!(sys::hv_vmx_vcpu_write_shadow_vmcs(self.0, field, value))
     }
+
+    /// Set the access permissions of a shadow VMCS field of a vCPU.
+    #[cfg(feature = "hv_10_15")]
+    fn set_shadow_access(&self, field: u32, flags: crate::vmx::ShadowFlags) -> Result<(), Error> {
+        call!(sys::hv_vmx_vcpu_set_shadow_access(
+            self.0,
+            field,
+            flags as sys::hv_shadow_flags_t
+        ))
+    }
 }

hv/src/vmx.rs

@@ -30,6 +30,15 @@ pub fn read_capability(field: Capacility) -> Result<u64, Error> {
     Ok(out)
 }
 
+#[cfg(feature = "hv_10_15")]
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub enum ShadowFlags {
+    None = sys::HV_SHADOW_VMCS_NONE,
+    Read = sys::HV_SHADOW_VMCS_READ,
+    Write = sys::HV_SHADOW_VMCS_WRITE,
+}
+
 pub trait VcpuExt {
     /// Returns the current value of a VMCS field of a vCPU.
     fn read_vmcs(&self, field: u32) -> Result<u64, Error>;
@@ -38,10 +47,16 @@ pub trait VcpuExt {
     fn write_vmcs(&self, field: u32, value: u64) -> Result<(), Error>;
 
     /// Returns the current value of a shadow VMCS field of a vCPU.
+    #[cfg(feature = "hv_10_15")]
     fn read_shadow_vmcs(&self, field: u32) -> Result<u64, Error>;
 
     /// Set the value of a shadow VMCS field of a vCPU.
+    #[cfg(feature = "hv_10_15")]
     fn write_shadow_vmcs(&self, field: u32, value: u64) -> Result<(), Error>;
+
+    /// Set the access permissions of a shadow VMCS field of a vCPU.
+    #[cfg(feature = "hv_10_15")]
+    fn set_shadow_access(&self, field: u32, flags: ShadowFlags) -> Result<(), Error>;
 }
 
 /// Virtual Machine Control Structure (VMCS) Field IDs.