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", optional = true }
+mshv-ioctls = { version = "0.5", optional = true}
 
 [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,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::fmt::{Debug, Formatter};
 
 use log::{error, LevelFilter};
@@ -71,7 +61,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;

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;