feat: 更新平台数据初始化，添加对 AxVMConfig 的支持

Author: ZR233

src/arch/aarch64/hal.rs

@@ -9,7 +9,7 @@ use crate::arch::PlatData;
 use crate::arch::cpu::CPUState;
 use crate::hal::cpu::{CpuHardId, CpuId};
 use crate::vdev::VDeviceList;
-use crate::{VmWeak, fdt};
+use crate::{AxVMConfig, VmWeak, fdt};
 
 pub struct Hal;
 
@@ -53,7 +53,7 @@ impl crate::hal::HalOp for Hal {
         Ok(vcpu)
     }
 
-    fn new_plat_data(vdevs: &VDeviceList) -> anyhow::Result<Self::PlatData> {
-        PlatData::new(vdevs)
+    fn new_plat_data(config: &AxVMConfig, vdevs: &VDeviceList) -> anyhow::Result<Self::PlatData> {
+        PlatData::new(config, vdevs)
     }
 }

src/arch/aarch64/plat.rs

@@ -1,25 +1,31 @@
 use arm_gic_driver::IntId;
 use arm_vgic::{IrqChipOp, v3};
 use axvdev::IrqNum;
+use axvmconfig::VMInterruptMode;
 use rdif_intc::Intc;
 
-use crate::{fdt::fdt_edit, hal::Ioremap, vdev::VDeviceList};
+use crate::{AxVMConfig, fdt::fdt_edit, hal::Ioremap, vdev::VDeviceList};
 
 pub struct PlatData {
     vdev: VDeviceList,
+    irq_passthrough: bool,
 }
 
 impl PlatData {
-    pub fn new(vdev_manager: &VDeviceList) -> anyhow::Result<Self> {
+    pub fn new(config: &AxVMConfig, vdev_manager: &VDeviceList) -> anyhow::Result<Self> {
         let mut s = Self {
             vdev: vdev_manager.clone(),
+            irq_passthrough: config.interrupt_mode == VMInterruptMode::Passthrough,
         };
         s.init()?;
         Ok(s)
     }
 
     fn init(&mut self) -> anyhow::Result<()> {
-        // self.new_vgic_v3()?;
+        if !self.irq_passthrough {
+            info!("Initializing GICv3 for interrupt virtualization");
+            self.new_vgic_v3()?;
+        }
         Ok(())
     }
 
@@ -85,4 +91,12 @@ impl IrqChipOp for IrqOp {
         };
         with_gicv3(|gic| gic.set_cfg(covnert_irq(irq), t));
     }
+
+    fn set_enable(&self, irq: IrqNum, enable: bool) {
+        with_gicv3(|gic| gic.set_irq_enable(covnert_irq(irq), enable));
+    }
+
+    fn is_enabled(&self, irq: IrqNum) -> bool {
+        with_gicv3(|gic| gic.is_irq_enable(covnert_irq(irq)))
+    }
 }

src/hal/mod.rs

@@ -18,7 +18,8 @@ pub mod timer;
 use cpu::{CpuHardId, CpuId};
 
 use crate::{
-    HostPhysAddr, HostVirtAddr, TASK_STACK_SIZE, VmWeak, arch::Hal, vcpu::VCpuOp, vdev::VDeviceList,
+    AxVMConfig, HostPhysAddr, HostVirtAddr, TASK_STACK_SIZE, VmWeak, arch::Hal, vcpu::VCpuOp,
+    vdev::VDeviceList,
 };
 
 pub trait HalOp: Send + 'static {
@@ -31,7 +32,7 @@ pub trait HalOp: Send + 'static {
     fn cpu_hard_id() -> CpuHardId;
     fn cpu_list() -> Vec<CpuHardId>;
     fn current_cpu_init(id: CpuId) -> anyhow::Result<Self::HCPU>;
-    fn new_plat_data(vdevs: &VDeviceList) -> anyhow::Result<Self::PlatData>;
+    fn new_plat_data(config: &AxVMConfig, vdevs: &VDeviceList) -> anyhow::Result<Self::PlatData>;
     fn new_vcpu(hard_id: CpuHardId, vm: VmWeak) -> anyhow::Result<Self::VCPU>;
 }
 

src/vm/machine/init.rs

@@ -54,7 +54,7 @@ impl<H: HalOp> StateInited<H> {
 
         let vdevs = VDeviceList::new(&vmspace);
 
-        let mut plat = H::new_plat_data(&vdevs)?;
+        let mut plat = H::new_plat_data(config, &vdevs)?;
 
         debug!(
             "Mapping memory regions for VM {} ({})",