Skip to content

Commit 601cea6

Browse files
committed
feat: 更新虚拟机配置,移除CPU配置并优化内核映像加载逻辑
1 parent 5c4baf8 commit 601cea6

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

kernel/src/vmm/config.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ pub fn build_vmconfig(cfg: AxVMCrateConfig) -> anyhow::Result<AxVMConfig> {
6969
id: cfg.base.id,
7070
name: cfg.base.name,
7171
cpu_num,
72-
cpu_config: AxVCpuConfig {
73-
bsp_entry: GuestPhysAddr::from(cfg.kernel.entry_point),
74-
ap_entry: GuestPhysAddr::from(cfg.kernel.entry_point),
75-
},
7672
image_config,
7773
memory_regions,
7874
emu_devices: cfg.devices.emu_devices,

kernel/src/vmm/images/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn load_images_mem(config: &AxVMCrateConfig) -> anyhow::Result<VMImagesConfig> {
3232

3333
// Load kernel image
3434
let kernel = VMImageConfig {
35-
gpa: Some(GuestPhysAddr::from(config.kernel.kernel_load_addr)),
35+
gpa: config.kernel.kernel_load_addr.map(GuestPhysAddr::from),
3636
data: memory_image.kernel.to_vec(),
3737
};
3838

modules/arm_vcpu

Submodule arm_vcpu updated 1 file

modules/axvmconfig

0 commit comments

Comments
 (0)