check if 0.5.1mshv crates work with az linux 2

Signed-off-by: Simon Davies <[email protected]>

Author: simongdavies

Cargo.lock

@@ -71,10 +71,8 @@ gdbstub_arch = { version = "0.3.1", optional = true }
 seccompiler = { version = "0.5.0", optional = true }
 kvm-bindings = { version = "0.12", features = ["fam-wrappers"], optional = true }
 kvm-ioctls = { version = "0.22", optional = true }
-mshv-bindings2 = { package="mshv-bindings", version = "=0.2.1", optional = true }
-mshv-ioctls2 = { package="mshv-ioctls",  version = "=0.2.1", optional = true}
-mshv-bindings3 = { package="mshv-bindings", version = "0.5.1", optional = true }
-mshv-ioctls3 = { package="mshv-ioctls",  version = "0.5.1", optional = true}
+mshv-bindings = { version = "0.5" }
+mshv-ioctls = { version = "0.5"}
 
 [dev-dependencies]
 uuid = { version = "1.17.0", features = ["v4"] }
@@ -125,8 +123,8 @@ executable_heap = []
 print_debug = []
 crashdump = ["dep:tempfile"] # Dumps the VM state to a file on unexpected errors or crashes. The path of the file will be printed on stdout and logged. This feature can only be used in debug builds.
 kvm = ["dep:kvm-bindings", "dep:kvm-ioctls"]
-mshv2 = ["dep:mshv-bindings2", "dep:mshv-ioctls2"]
-mshv3 = ["dep:mshv-bindings3", "dep:mshv-ioctls3"]
+mshv2 = []
+mshv3 = []
 # This enables easy debug in the guest
 gdb = ["dep:gdbstub", "dep:gdbstub_arch"]
 fuzzing = ["hyperlight-common/fuzzing"]

src/hyperlight_host/Cargo.toml

@@ -14,12 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#[cfg(mshv2)]
-extern crate mshv_ioctls2 as mshv_ioctls;
-
-#[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
-
 use std::array::TryFromSliceError;
 use std::cell::{BorrowError, BorrowMutError};
 use std::convert::Infallible;

src/hyperlight_host/src/error.rs

@@ -14,16 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#[cfg(mshv2)]
-extern crate mshv_bindings2 as mshv_bindings;
-#[cfg(mshv2)]
-extern crate mshv_ioctls2 as mshv_ioctls;
-
-#[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
-#[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
-
 use std::collections::HashMap;
 
 use mshv_bindings::{

src/hyperlight_host/src/hypervisor/gdb/mshv_debug.rs

@@ -14,21 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#[cfg(mshv2)]
-extern crate mshv_bindings2 as mshv_bindings;
-#[cfg(mshv2)]
-extern crate mshv_ioctls2 as mshv_ioctls;
-
-#[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
-#[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
-
 use std::fmt::{Debug, Formatter};
 
 use log::{error, LevelFilter};
-#[cfg(mshv2)]
-use mshv_bindings::hv_message;
 #[cfg(gdb)]
 use mshv_bindings::{
     hv_intercept_parameters, hv_intercept_type_HV_INTERCEPT_TYPE_EXCEPTION,
@@ -41,7 +29,7 @@ use mshv_bindings::{
     hv_register_name_HV_X64_REGISTER_RIP, hv_register_value, mshv_user_mem_region,
     FloatingPointUnit, SegmentRegister, SpecialRegisters, StandardRegisters,
 };
-#[cfg(mshv3)]
+#[cfg(any(mshv3,mshv2))]
 use mshv_bindings::{
     hv_partition_property_code_HV_PARTITION_PROPERTY_SYNTHETIC_PROC_FEATURES,
     hv_partition_synthetic_processor_features,
@@ -71,7 +59,8 @@ use crate::{log_then_return, new_error, Result};
 mod debug {
     use std::sync::{Arc, Mutex};
 
-    use super::mshv_bindings::hv_x64_exception_intercept_message;
+    use mshv_bindings::hv_x64_exception_intercept_message;
+
     use super::{HypervLinuxDriver, *};
     use crate::hypervisor::gdb::{DebugMsg, DebugResponse, VcpuStopReason, X86_64Regs};
     use crate::hypervisor::handlers::DbgMemAccessHandlerCaller;
@@ -319,9 +308,7 @@ impl HypervLinuxDriver {
     ) -> Result<Self> {
         let mshv = Mshv::new()?;
         let pr = Default::default();
-        #[cfg(mshv2)]
-        let vm_fd = mshv.create_vm_with_config(&pr)?;
-        #[cfg(mshv3)]
+        #[cfg(any(mshv2, mshv3))]
         let vm_fd = {
             // It's important to avoid create_vm() and explicitly use
             // create_vm_with_args() with an empty arguments structure
@@ -577,12 +564,7 @@ impl Hypervisor for HypervLinuxDriver {
         #[cfg(gdb)]
         const EXCEPTION_INTERCEPT: hv_message_type = hv_message_type_HVMSG_X64_EXCEPTION_INTERCEPT;
 
-        #[cfg(mshv2)]
-        let run_result = {
-            let hv_message: hv_message = Default::default();
-            &self.vcpu_fd.run(hv_message)
-        };
-        #[cfg(mshv3)]
+        #[cfg(any(mshv2,mshv3))]
         let run_result = &self.vcpu_fd.run();
 
         let result = match run_result {

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -14,16 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#[cfg(mshv2)]
-extern crate mshv_bindings2 as mshv_bindings;
-#[cfg(mshv2)]
-extern crate mshv_ioctls2 as mshv_ioctls;
-
-#[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
-#[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
-
 use std::ops::Range;
 
 use bitflags::bitflags;
@@ -32,11 +22,7 @@ use hyperlight_common::mem::PAGE_SHIFT;
 use hyperlight_common::mem::PAGE_SIZE_USIZE;
 #[cfg(mshv)]
 use mshv_bindings::{hv_x64_memory_intercept_message, mshv_user_mem_region};
-#[cfg(mshv2)]
-use mshv_bindings::{
-    HV_MAP_GPA_EXECUTABLE, HV_MAP_GPA_PERMISSIONS_NONE, HV_MAP_GPA_READABLE, HV_MAP_GPA_WRITABLE,
-};
-#[cfg(mshv3)]
+#[cfg(any(mshv2,mshv3))]
 use mshv_bindings::{
     MSHV_SET_MEM_BIT_EXECUTABLE, MSHV_SET_MEM_BIT_UNMAP, MSHV_SET_MEM_BIT_WRITABLE,
 };
@@ -232,26 +218,7 @@ impl From<MemoryRegion> for mshv_user_mem_region {
         let guest_pfn = region.guest_region.start as u64 >> PAGE_SHIFT;
         let userspace_addr = region.host_region.start as u64;
 
-        #[cfg(mshv2)]
-        {
-            let flags = region.flags.iter().fold(0, |acc, flag| {
-                let flag_value = match flag {
-                    MemoryRegionFlags::NONE => HV_MAP_GPA_PERMISSIONS_NONE,
-                    MemoryRegionFlags::READ => HV_MAP_GPA_READABLE,
-                    MemoryRegionFlags::WRITE => HV_MAP_GPA_WRITABLE,
-                    MemoryRegionFlags::EXECUTE => HV_MAP_GPA_EXECUTABLE,
-                    _ => 0, // ignore any unknown flags
-                };
-                acc | flag_value
-            });
-            mshv_user_mem_region {
-                guest_pfn,
-                size,
-                userspace_addr,
-                flags,
-            }
-        }
-        #[cfg(mshv3)]
+        #[cfg(any(mshv2, mshv3))]
         {
             let flags: u8 = region.flags.iter().fold(0, |acc, flag| {
                 let flag_value = match flag {