wip: migrate arceos

Author: AsakuraMizu

Cargo.lock

@@ -32,37 +32,41 @@ timer_list = "0.1"
 toml = "0.9"
 
 # System dependent modules provided by ArceOS.
-axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1", features = [
+# FIXME: pin to a specific tag!
+axstd = {git = "https://github.com/arceos-org/arceos.git", branch = "dev", features = [
   "alloc-level-1",
   "paging",
   "irq",
   "multitask",
   "smp", # "page-alloc-64g",
 ]}
 
-axalloc = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axconfig = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axdisplay = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axdriver = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axfs = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axhal = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axipi = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axlog = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axmm = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axnet = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axtask = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
+axalloc = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axconfig = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axdisplay = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axdriver = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axfs = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axhal = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axipi = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axlog = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axmm = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axnet = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
+axtask = {git = "https://github.com/arceos-org/arceos.git", branch = "dev"}
 
-axplat = {git = "https://github.com/arceos-hypervisor/axplat_crates.git", tag = "vmm-v0.3.0"}
+axcpu = {git = "https://github.com/arceos-org/axcpu.git", tag = "dev-v03"}
+axplat = {git = "https://github.com/arceos-org/axplat_crates.git", tag = "dev-v03"}
 
 # System dependent modules provided by ArceOS-Hypervisor.
 axaddrspace = "0.1.1"
-axhvc = {git = "https://github.com/arceos-hypervisor/axhvc.git"}
+# FIXME: AsakuraMizu fork -> arceos-hypervisor!
+axhvc = {git = "https://github.com/AsakuraMizu/axhvc.git"}
+axklib = {git = "https://github.com/AsakuraMizu/axklib.git",branch = "dev"}
 axruntime = {path = "modules/axruntime"}
 axvcpu = "0.1"
-axvm = {git = "https://github.com/arceos-hypervisor/axvm.git", branch = "next"}
+axvm = {git = "https://github.com/Asakuramizu/axvm.git", branch = "next-dev"}
 
 # System independent crates provided by ArceOS, these crates could be imported by remote url. 
-axerrno = "0.1.0"
+axerrno = "0.2"
 byte-unit = {version = "5", default-features = false, features = ["byte"]}
 crate_interface = "0.1"
 fdt-parser = "0.4"
@@ -88,6 +92,6 @@ axvmconfig = {git = "https://github.com/arceos-hypervisor/axvmconfig.git", branc
 axvcpu = {git = "https://github.com/arceos-hypervisor/axvcpu.git", branch = "next"}
 axvmconfig = {git = "https://github.com/arceos-hypervisor/axvmconfig.git", branch = "next"}
 
-[patch."https://github.com/arceos-hypervisor/arceos"]
+[patch."https://github.com/arceos-org/arceos"]
 axconfig = {path = "modules/axconfig"}
 axruntime = {path = "modules/axruntime"}

Cargo.toml

@@ -62,7 +62,7 @@ aarch64-cpu-ext = "0.1"
 arm-gic-driver = {version = "0.15.5", features = ["rdif"]}
 
 [build-dependencies]
-axconfig = {git = "https://github.com/arceos-hypervisor/arceos.git", branch = "vmm-dev"}
+axconfig.workspace = true
 prettyplease = "0.2"
 quote = "1.0"
 syn = "2.0"

kernel/Cargo.toml

@@ -64,7 +64,7 @@ impl AxVMHal for AxVMHalImpl {
             .ok_or_else(|| ax_err_type!(NotFound))
     }
 
-    fn inject_irq_to_vcpu(vm_id: usize, vcpu_id: usize, irq: usize) -> axerrno::AxResult {
+    fn inject_irq_to_vcpu(vm_id: usize, vcpu_id: usize, irq: usize) -> AxResult {
         vmm::with_vm_and_vcpu_on_pcpu(vm_id, vcpu_id, move |_, vcpu| {
             vcpu.inject_interrupt(irq).unwrap();
         })

kernel/src/hal/mod.rs

@@ -53,5 +53,6 @@ chrono = {version = "0.4.38", default-features = false}
 axplat-x86-qemu-q35 = {workspace = true}
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-axplat-aarch64-dyn = {git = "https://github.com/arceos-hypervisor/axplat-aarch64-dyn", tag = "v0.3.3", features = ["irq", "smp", "hv"]}
+# FIXME: AsakuraMizu fork -> arceos-aarch64-dyn!
+axplat-aarch64-dyn = {git = "https://github.com/AsakuraMizu/axplat-aarch64-dyn.git", branch = "v03", features = ["irq", "smp", "hv"]}
 somehal = "0.4"

modules/axruntime/Cargo.toml

@@ -112,7 +112,7 @@ fn is_init_ok() -> bool {
 #[cfg_attr(not(test), axplat::main)]
 pub fn rust_main(cpu_id: usize, arg: usize) -> ! {
     unsafe { axhal::mem::clear_bss() };
-    axhal::init_percpu(cpu_id);
+    axhal::percpu::init_primary(cpu_id);
     axhal::init_early(cpu_id, arg);
 
     ax_println!("{}", LOGO);

modules/axruntime/src/lib.rs

@@ -39,7 +39,7 @@ pub fn start_secondary_cpus(primary_cpu_id: usize) {
 /// It is called from the bootstrapping code in the specific platform crate.
 #[axplat::secondary_main]
 pub fn rust_main_secondary(cpu_id: usize) -> ! {
-    axhal::init_percpu_secondary(cpu_id);
+    axhal::percpu::init_secondary(cpu_id);
     axhal::init_early_secondary(cpu_id);
 
     ENTERED_CPUS.fetch_add(1, Ordering::Release);

modules/axruntime/src/mp.rs

@@ -14,7 +14,7 @@ rockchip-pm = ["dep:rockchip-pm"]
 phytium-blk = ["dep:phytium-mci"]
 
 [dependencies]
-axklib = {git = "https://github.com/arceos-hypervisor/axklib"}
+axklib.workspace = true
 log.workspace = true
 rdif-block = "0.6.2"
 rdif-clk = "0.4"

modules/driver/Cargo.toml

@@ -17,7 +17,7 @@ smp = ["axplat/smp", "kspin/smp"]
 
 [dependencies]
 axconfig-macros = "0.2"
-axcpu = "0.2"
+axcpu = {workspace = true}
 axplat = {workspace = true}
 bitflags = "2.6"
 heapless = "0.9"