fix build error without mpk

anti-entropy123 · Jan 14, 2025 · ed4f775 · ed4f775
1 parent 059f43e
commit ed4f775
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/libmsvisor/src/isolation/handler.rs b/libmsvisor/src/isolation/handler.rs
@@ -3,13 +3,14 @@ use std::mem::transmute;
 
 use log::info;
 use ms_hostcall::{
-    mpk::LIBOS_PKEY,
     types::{FsImageFunc, IsolationID, MetricEvent, MetricFunc, NetdevName},
     CommonHostCall, HostCallID,
 };
 
 #[cfg(feature = "enable_mpk")]
 use crate::mpk;
+#[cfg(feature = "enable_mpk")]
+use ms_hostcall::mpk::LIBOS_PKEY;
 
 use crate::{isolation::get_isol, logger};
 

diff --git a/libmsvisor/src/isolation/mod.rs b/libmsvisor/src/isolation/mod.rs
@@ -12,17 +12,16 @@ use anyhow::{anyhow, Ok};
 
 use lazy_static::lazy_static;
 use log::info;
-use ms_hostcall::{
-    mpk::LIBOS_PKEY,
-    types::{
-        IsolationID as IsolID,
-        MetricEvent::{IsolBegin, IsolEnd, Mem},
-        ServiceName,
-    },
+use ms_hostcall::types::{
+    IsolationID as IsolID,
+    MetricEvent::{IsolBegin, IsolEnd, Mem},
+    ServiceName,
 };
 
 #[cfg(feature = "enable_mpk")]
 use crate::{mpk, mpk::must_init_all_pkeys};
+#[cfg(feature = "enable_mpk")]
+use ms_hostcall::mpk::LIBOS_PKEY;
 
 use crate::{
     logger,

diff --git a/user/file_reader/Cargo.toml b/user/file_reader/Cargo.toml
@@ -18,4 +18,4 @@ heapless = "0.8.0"
 mpk = ["ms_std/mpk"]
 pkey_per_func = ["mpk"]
 
-default = ["pkey_per_func"]
+default = []
diff --git a/user/splitter/Cargo.toml b/user/splitter/Cargo.toml
@@ -17,4 +17,4 @@ heapless = "0.8.0"
 [features]
 mpk = ["ms_std/mpk"]
 pkey_per_func = ["mpk"]
-default = ["pkey_per_func"]
+default = []