Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
cargo version
export DISK_IMG="${{ github.workspace }}/disk-aarch64.img"
export VM_CONFIGS="$(pwd)/configs/vms/nimbos-aarch64-qemu-smp1.toml"
./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs,ept-level-4 --arceos-args DISK_IMG=$DISK_IMG,BUS=mmio,BLK=y,MEM=8g
./scripts/auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs,ept-level-4 --arceos-args DISK_IMG=$DISK_IMG,BUS=mmio,BLK=y,MEM=8g,LOG=info

aarch64-generic-phytiumpi:
runs-on: [self-hosted, linux, phytiumpi]
Expand Down Expand Up @@ -135,4 +135,4 @@ jobs:
cargo version
export DISK_IMG="${{ github.workspace }}/disk-x86_64.img"
export VM_CONFIGS="$(pwd)/configs/vms/nimbos-x86_64-qemu-smp1.toml"
./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs --arceos-args DISK_IMG=$DISK_IMG,BLK=y
./scripts/auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs --arceos-args DISK_IMG=$DISK_IMG,BLK=y,LOG=info
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ lazyinit = "0.2"
log = "=0.4.21"
spin = "0.9"
timer_list = "0.1.0"
lazy_static = { version = "1.5", default-features = false, features = ["spin_no_std"] }

# System dependent modules provided by ArceOS.
axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.3.1", features = [
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ Currently, AxVisor has been verified in scenarios with the following systems as
- [NimbOS](https://github.com/equation314/nimbos)
- Linux

## Shell Management

AxVisor provides an interactive shell interface for managing virtual machines and file operations.

For detailed information about shell features, commands, and usage, see: [Shell模块介绍.md](doc/Shell模块介绍.md)

# Build and Run

After AxVisor starts, it loads and starts the guest based on the information in the guest configuration file. Currently, AxVisor supports loading guest images from a FAT32 file system and also supports binding guest images to the hypervisor image through static compilation (using include_bytes).
Expand Down
2 changes: 1 addition & 1 deletion configs/vms/arceos-aarch64-e2000-smp2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ image_location = "memory"
# The load address of the kernel image.
kernel_load_addr = 0x20_2008_0000
## The file path of the kernel image.
kernel_path = "/path/to/arceos_aarch64-dyn_smp1.bin"
kernel_path = "/guest/arceos/arceos_aarch64-dyn_smp2.bin"
## The file path of the device tree blob (DTB).
dtb_load_addr = 0x20_2000_0000
#dtb_path = "/path/to/axvisor/configs/vms/arceos-aarch64-e2000_smp2.dtb"
Expand Down
4 changes: 2 additions & 2 deletions configs/vms_bkp/arceos-aarch64.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ phys_cpu_sets = [2]
entry_point = 0x4020_0000
# The location of image: "memory" | "fs".
# Load from file system.
image_location = "memory"
image_location = "fs"
# The file path of the kernel image.
kernel_path = "path/to/kernel"
kernel_path = "helloworld_aarch64-qemu-virt.bin"
# The load address of the kernel image.
kernel_load_addr = 0x4020_0000
## Load from memory
Expand Down
Loading
Loading