diff --git a/Cargo.lock b/Cargo.lock index 8e347ba365..982055f2fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,7 +117,6 @@ dependencies = [ "axsync", "axtask", "bindgen", - "crate_interface", "ctor_bare", "flatten_objects", "lazy_static", @@ -490,7 +489,6 @@ dependencies = [ "axlog", "axmm", "axnet", - "axns", "axtask", "chrono", "crate_interface", @@ -732,18 +730,18 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "ctor_bare" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d136495eea0dc68b0a4e23e94a2012b7a87934e09c9b684f79f3027c901c14bd" +checksum = "ace93bf09b338be4a969737b537cf9d48017fda638bd0f604f249918531a4546" dependencies = [ "ctor_bare_macros", ] [[package]] name = "ctor_bare_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762fc30ffde1b507138835d6d55006ce43efc80fdbf940bd1080cda9991611b" +checksum = "00585e1458b28ccdde0704f17ec14930acd155b3996a0c8aec79e52a0e849318" dependencies = [ "proc-macro2", "quote", diff --git a/api/arceos_posix_api/Cargo.toml b/api/arceos_posix_api/Cargo.toml index c2f2938658..bf52512b98 100644 --- a/api/arceos_posix_api/Cargo.toml +++ b/api/arceos_posix_api/Cargo.toml @@ -52,7 +52,6 @@ flatten_objects = "0.1" static_assertions = "1.1.0" spin = { version = "0.9" } lazy_static = { version = "1.5", features = ["spin_no_std"] } -crate_interface = "0.1" ctor_bare = "0.1" [build-dependencies] diff --git a/modules/axfs/src/fops.rs b/modules/axfs/src/fops.rs index d9559b99c2..621a09450a 100644 --- a/modules/axfs/src/fops.rs +++ b/modules/axfs/src/fops.rs @@ -17,12 +17,8 @@ pub type FileType = axfs_vfs::VfsNodeType; pub type DirEntry = axfs_vfs::VfsDirEntry; /// Alias of [`axfs_vfs::VfsNodeAttr`]. pub type FileAttr = axfs_vfs::VfsNodeAttr; -/// Alias of [`axfs_vfs::VfsNodeAttr`]. -pub type DirAttr = axfs_vfs::VfsNodeAttr; /// Alias of [`axfs_vfs::VfsNodePerm`]. pub type FilePerm = axfs_vfs::VfsNodePerm; -/// Alias of [`axfs_vfs::VfsNodePerm`]. -pub type DirPerm = axfs_vfs::VfsNodePerm; /// An opened file object, with open permissions and a cursor. pub struct File { @@ -250,11 +246,6 @@ impl File { pub fn get_attr(&self) -> AxResult { self.access_node(Cap::empty())?.get_attr() } - - /// Gets the inode number of the file. - pub fn get_inode(&self) -> u64 { - 0 - } } impl Directory { @@ -354,16 +345,6 @@ impl Directory { pub fn rename(&self, old: &str, new: &str) -> AxResult { crate::root::rename(old, new) } - - /// Gets the directory attributes. - pub fn get_attr(&self) -> AxResult { - self.access_node(Cap::empty())?.get_attr() - } - - /// Gets the inode number of the file. - pub fn get_inode(&self) -> u64 { - 0 - } } impl Drop for File { diff --git a/modules/axmm/src/lib.rs b/modules/axmm/src/lib.rs index b0eacfec1d..ba44598d41 100644 --- a/modules/axmm/src/lib.rs +++ b/modules/axmm/src/lib.rs @@ -38,6 +38,7 @@ pub fn new_kernel_aspace() -> AxResult { )?; for r in axhal::mem::memory_regions() { if r.size == 0 { + info!("Skip zero-size memory region: {:?}", r); continue; } aspace.map_linear(phys_to_virt(r.paddr), r.paddr, r.size, r.flags.into())?; diff --git a/modules/axruntime/Cargo.toml b/modules/axruntime/Cargo.toml index d7dcd9311a..b74ba0438e 100644 --- a/modules/axruntime/Cargo.toml +++ b/modules/axruntime/Cargo.toml @@ -15,7 +15,7 @@ default = [] smp = ["axhal/smp"] irq = ["axhal/irq", "axtask?/irq", "percpu", "kernel_guard"] tls = ["axhal/tls", "axtask?/tls"] -alloc = ["axalloc", "axns"] +alloc = ["axalloc"] paging = ["axhal/paging", "axmm"] multitask = ["axtask/multitask"] @@ -35,7 +35,6 @@ axfs = { workspace = true, optional = true } axnet = { workspace = true, optional = true } axdisplay = { workspace = true, optional = true } axtask = { workspace = true, optional = true } -axns = { workspace = true, optional = true } crate_interface = "0.1" percpu = { version = "0.1", optional = true }