Skip to content

refactor: extract shell and VMM into separate modules with enhanced shell features #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZR233 merged 4 commits into from
Jan 6, 2026
Merged

refactor: extract shell and VMM into separate modules with enhanced shell features #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e43e27
refactor: extract shell and vmm into separate modules
YanLien Dec 24, 2025
95db1ad
fix: update paths for axvisor-vmm and axvisor-shell to relative refer…
YanLien Dec 25, 2025
dc1b312
feat: Implement tab completion and command history management
YanLien Jan 6, 2026
a316f88
refactor: integrate shell and vmm modules directly into kernel
YanLien Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions kernel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ cfg-if.workspace = true
cpumask.workspace = true
kernel_guard.workspace = true
kspin = "0.1"
lazy_static = {version = "1.5", default-features = false, features = ["spin_no_std"]}
lazyinit = "0.2"
log = "0.4"
spin = "0.9"
timer_list = "0.1.0"
toml = {version = "0.9", default-features = false}

Expand All @@ -29,14 +27,20 @@ axstd.workspace = true
# System dependent modules provided by ArceOS-Hypervisor.
axhvc.workspace = true
axvm.workspace = true
axvmconfig = {workspace = true}
axvmconfig = { workspace = true }

# System independent crates provided by ArceOS, these crates could be imported by remote url.
axerrno.workspace = true
byte-unit = {version = "5", default-features = false, features = ["byte"]}
extern-trait = "0.2"
memory_addr.workspace = true
driver.workspace = true
spin = "0.9"

# axvm = { path = "../axvm" }
# axvmconfig = { version = "0.1", default-features = false }

lazy_static = {version = "1.5", default-features = false, features = ["spin_no_std"]}

[build-dependencies]
anyhow = "1.0"
Expand Down
9 changes: 6 additions & 3 deletions kernel/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ extern crate log;
extern crate alloc;

extern crate axstd as std;
extern crate driver;

// extern crate axruntime;
extern crate driver;

mod logo;
// mod shell;
mod task;
mod shell;
mod vmm;

pub use shell::*;
pub use vmm::*;

#[unsafe(no_mangle)]
fn main() {
logo::print_logo();
Expand All @@ -30,5 +33,5 @@ fn main() {
info!("[OK] Default guest initialized");
vmm::wait_for_all_vms_exit();
info!("All guest VMs exited.");
// shell::console_init();
shell::console_init();
}
Loading
Loading