Rename to mshv_ioctls and mshv_bindings

Signed-off-by: Doru Blânzeanu <[email protected]>

Author: dblnz

src/hyperlight_host/Cargo.toml

@@ -77,8 +77,8 @@ lazy_static = "1.4.0"
 [target.'cfg(unix)'.dependencies]
 kvm-bindings = { version = "0.14", features = ["fam-wrappers"], optional = true }
 kvm-ioctls = { version = "0.24", optional = true }
-mshv-bindings3 = { package="mshv-bindings", version = "0.6.1", optional = true }
-mshv-ioctls3 = { package="mshv-ioctls",  version = "0.6.1", optional = true}
+mshv-bindings = { version = "0.6.1", optional = true }
+mshv-ioctls = { version = "0.6.1", optional = true}
 
 [dev-dependencies]
 uuid = { version = "1.18.1", features = ["v4"] }
@@ -133,7 +133,7 @@ crashdump = ["dep:chrono"]
 trace_guest = ["dep:opentelemetry", "dep:tracing-opentelemetry", "dep:hyperlight-guest-tracing", "hyperlight-common/trace_guest"]
 mem_profile = [ "trace_guest", "dep:framehop", "dep:fallible-iterator", "hyperlight-common/mem_profile" ]
 kvm = ["dep:kvm-bindings", "dep:kvm-ioctls"]
-mshv3 = ["dep:mshv-bindings3", "dep:mshv-ioctls3"]
+mshv3 = ["dep:mshv-bindings", "dep:mshv-ioctls"]
 # This enables easy debug in the guest
 gdb = ["dep:gdbstub", "dep:gdbstub_arch"]
 fuzzing = ["hyperlight-common/fuzzing"]

src/hyperlight_host/src/error.rs

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 #[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
+extern crate mshv_ioctls;
 
 use std::array::TryFromSliceError;
 use std::cell::{BorrowError, BorrowMutError};
@@ -379,7 +379,7 @@ impl HyperlightError {
             HyperlightError::VmmSysError(_) => false,
             #[cfg(kvm)]
             HyperlightError::KVMError(_) => false,
-            #[cfg(mshv)]
+            #[cfg(mshv3)]
             HyperlightError::MSHVError(_) => false,
             #[cfg(gdb)]
             HyperlightError::TranslateGuestAddress(_) => false,

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

@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 #[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
+extern crate mshv_bindings;
 #[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
+extern crate mshv_ioctls;
 
 use std::collections::HashMap;
 

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-extern crate mshv_bindings3 as mshv_bindings;
-extern crate mshv_ioctls3 as mshv_ioctls;
+extern crate mshv_bindings;
+extern crate mshv_ioctls;
 
 use std::fmt::{Debug, Formatter};
 use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};

src/hyperlight_host/src/hypervisor/regs/fpu.rs

@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
+extern crate mshv_bindings;
 #[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
+extern crate mshv_ioctls;
 
 #[cfg(target_os = "windows")]
 use std::collections::HashSet;

src/hyperlight_host/src/hypervisor/regs/special_regs.rs

@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 #[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
+extern crate mshv_bindings;
 #[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
+extern crate mshv_ioctls;
 
 #[cfg(target_os = "windows")]
 use std::collections::HashSet;

src/hyperlight_host/src/hypervisor/regs/standard_regs.rs

@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 #[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
+extern crate mshv_bindings;
 #[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
+extern crate mshv_ioctls;
 
 #[cfg(kvm)]
 use kvm_bindings::kvm_regs;

src/hyperlight_host/src/mem/memory_region.rs

@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 #[cfg(mshv3)]
-extern crate mshv_bindings3 as mshv_bindings;
+extern crate mshv_bindings;
 #[cfg(mshv3)]
-extern crate mshv_ioctls3 as mshv_ioctls;
+extern crate mshv_ioctls;
 
 use std::ops::Range;