update e2000 config file

Author: YanLien

configs/vms/arceos-aarch64-e2000_smp1.toml

@@ -26,14 +26,14 @@ 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 = "/guest/arceos-aarch64-e2000_smp1.bin"
+kernel_path = "/path/to/arceos_aarch64-dyn_smp1.bin"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_2000_0000
-dtb_path = "/guest/arceos-aarch64-e2000_smp1.dtb"
+dtb_path = "/path/to/axvisor/configs/vms/arceos-aarch64-e2000_smp1.dtb"
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
 memory_regions = [
-  #[0x20_2000_0000, 0x2000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
+    [0x20_2000_0000, 0x2000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
 ]
 
 #
@@ -47,25 +47,25 @@ emu_devices = []
 # Pass-through devices.
 # Name Base-Ipa Base-Pa Length Alloc-Irq.
 passthrough_devices = [
-  [
-    "UART1",
-    0x2800_d000,
-    0x2800_d000,
-    0x1000,
-    0x1,
-  ],
-  [
-    "gic-v3",
-    0x3080_0000,
-    0x3080_0000,
-    0x10000,
-    0x1,
-  ],
-  [
-    "gic-v3-its",
-    0x3082_0000,
-    0x3082_0000,
-    0x100000,
-    0x1,
-  ],
+    [
+        "UART1",
+        0x2800_d000,
+        0x2800_d000,
+        0x1000,
+        0x1,
+    ],
+    [
+        "gic-v3",
+        0x3080_0000,
+        0x3080_0000,
+        0x10000,
+        0x1,
+    ],
+    [
+        "gic-v3-its",
+        0x3082_0000,
+        0x3082_0000,
+        0x100000,
+        0x1,
+    ],
 ]

configs/vms/arceos-aarch64-e2000_smp2.toml

@@ -26,14 +26,14 @@ 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 = "/guest/arceos-aarch64-e2000_smp2.bin"
+kernel_path = "/path/to/arceos_aarch64-dyn_smp1.bin"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_2000_0000
-dtb_path = "/guest/arceos-aarch64-e2000_smp2.dtb"
+dtb_path = "/path/to/axvisor/configs/vms/arceos-aarch64-e2000_smp2.dtb"
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
 memory_regions = [
-  #[0x20_2000_0000, 0x2000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
+  [0x20_2000_0000, 0x2000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
 ]
 
 #

configs/vms/linux-aarch64-e2000_smp1.toml

@@ -22,18 +22,18 @@ phys_cpu_sets = [8]
 entry_point = 0x20_4008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "fs"
+image_location = "memory"
 # The load address of the kernel image.
 kernel_load_addr = 0x20_4008_0000
 ## The file path of the kernel image.
-kernel_path = "/guest/Image"
+kernel_path = "/path/to/Image"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_4000_0000
-dtb_path = "/guest/linux-aarch64-e2000_smp1.dtb"
+dtb_path = "/path/to/axvisor/configs/vms/linux-aarch64-e2000_smp1.dtb"
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
 memory_regions = [
-  # [0x20_4000_0000, 0x4000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
+  [0x20_4000_0000, 0x4000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
 ]
 
 #
@@ -42,6 +42,7 @@ memory_regions = [
 [devices]
 # Emu_devices.
 # Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig.
+interrupt_mode = "passthrough"
 emu_devices = []
 
 # Pass-through devices.

configs/vms/linux-aarch64-e2000_smp2.toml

@@ -22,18 +22,18 @@ phys_cpu_sets = [1, 4]
 entry_point = 0x20_4008_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "fs"
+image_location = "memory"
 # The load address of the kernel image.
 kernel_load_addr = 0x20_4008_0000
 ## The file path of the kernel image.
-kernel_path = "/guest/Image"
+kernel_path = "/path/to/Image"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_4000_0000
-dtb_path = "/guest/linux-aarch64-e2000_smp2.dtb"
+dtb_path = "/path/to/axvisor/configs/vms/linux-aarch64-e2000_smp2.dtb"
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
 memory_regions = [
-  # [0x20_4000_0000, 0x4000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
+  [0x20_4000_0000, 0x4000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
   # [0xa000_0000, 0x2000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
 ]
 
@@ -43,6 +43,7 @@ memory_regions = [
 [devices]
 # Emu_devices.
 # Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig.
+interrupt_mode = "passthrough"
 emu_devices = []
 
 # Pass-through devices.

scripts/config.py

@@ -234,7 +234,7 @@ def get_env_variables(self) -> Dict[str, str]:
 
         # 处理 vmconfigs 作为环境变量
         if self.vmconfigs:
-            env_vars["AXVISOR_VM_CONFIGS"] = ",".join(self.vmconfigs)
+            env_vars["AXVISOR_VM_CONFIGS"] = ":".join(self.vmconfigs)
 
         return env_vars