arch: Switch to new GIC interface

Signed-off-by: Michael Zhao <michael.zhao@arm.com>

arch/src/aarch64/fdt.rs

@@ -8,6 +8,7 @@
 
 use crate::{NumaNodes, PciSpaceInfo};
 use byteorder::{BigEndian, ByteOrder};
+use hypervisor::arch::aarch64::gic::Vgic;
 use std::cmp;
 use std::collections::HashMap;
 use std::ffi::CStr;
@@ -18,7 +19,6 @@ use std::str;
 use super::super::DeviceType;
 use super::super::GuestMemoryMmap;
 use super::super::InitramfsConfig;
-use super::gic::GicDevice;
 use super::layout::{
     IRQ_BASE, MEM_32BIT_DEVICES_SIZE, MEM_32BIT_DEVICES_START, MEM_PCI_IO_SIZE, MEM_PCI_IO_START,
     PCI_HIGH_BASE, PCI_MMIO_CONFIG_SIZE_PER_SEGMENT,
@@ -90,7 +90,7 @@ pub fn create_fdt<T: DeviceInfoForFdt + Clone + Debug, S: ::std::hash::BuildHash
     vcpu_mpidr: Vec<u64>,
     vcpu_topology: Option<(u8, u8, u8)>,
     device_info: &HashMap<(DeviceType, String), T, S>,
-    gic_device: &dyn GicDevice,
+    gic_device: &dyn Vgic,
     initrd: &Option<InitramfsConfig>,
     pci_space_info: &[PciSpaceInfo],
     numa_nodes: &NumaNodes,
@@ -315,7 +315,7 @@ fn create_chosen_node(
     Ok(())
 }
 
-fn create_gic_node(fdt: &mut FdtWriter, gic_device: &dyn GicDevice) -> FdtWriterResult<()> {
+fn create_gic_node(fdt: &mut FdtWriter, gic_device: &dyn Vgic) -> FdtWriterResult<()> {
     let gic_reg_prop = gic_device.device_properties();
 
     let intc_node = fdt.begin_node("intc")?;

arch/src/aarch64/gic.rs

@@ -1,11 +1,12 @@
 // Copyright 2021 Arm Limited (or its affiliates). All rights reserved.
 
+use crate::layout;
+use anyhow::anyhow;
 use hypervisor::{arch::aarch64::gic::Vgic, CpuState};
 use std::result;
 use std::sync::Arc;
-use vm_migration::{
-    Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable, VersionMapped,
-};
+use vm_memory::Address;
+use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
 
 /// Errors thrown while setting up the GIC.
 #[derive(Debug)]
@@ -35,7 +36,9 @@ impl GicDevice {
         Ok(GicDevice { vgic })
     }
 
-    pub fn set_gicr_typers(&mut self, vcpu_states: &[CpuState]) {}
+    pub fn set_gicr_typers(&mut self, vcpu_states: &[CpuState]) {
+        self.vgic.set_gicr_typers(vcpu_states)
+    }
 
     pub fn get_vgic(&self) -> &dyn Vgic {
         &*self.vgic
@@ -54,30 +57,23 @@ impl Snapshottable for GicDevice {
     }
 
     fn restore(&mut self, snapshot: Snapshot) -> std::result::Result<(), MigratableError> {
-        self.vgic.set_state(&snapshot.to_state(&self.id())?)
+        self.vgic
+            .set_state(&snapshot.to_state(&self.id())?)
             .map_err(|e| {
                 MigratableError::Restore(anyhow!("Could not restore GICv3ITS state {:?}", e))
             })
-        Ok(())
     }
 }
 
 impl Pausable for GicDevice {
     fn pause(&mut self) -> std::result::Result<(), MigratableError> {
-        /*
-                // Flush redistributors pending tables to guest RAM.
-                KvmGicDevice::save_pending_tables(self.device()).map_err(|e| {
-                    MigratableError::Pause(anyhow!(
-                        "Could not save GICv3ITS GIC pending tables {:?}",
-                        e
-                    ))
-                })?;
-                // Flush ITS tables to guest RAM.
-                gicv3_its_tables_access(self.its_device().unwrap(), true).map_err(|e| {
-                    MigratableError::Pause(anyhow!("Could not save GICv3ITS ITS tables {:?}", e))
-                })?;
-        */
-        Ok(())
+        // Flush tables to guest RAM
+        self.vgic.save_data_tables().map_err(|e| {
+            MigratableError::Pause(anyhow!(
+                "Could not save GICv3ITS GIC pending tables {:?}",
+                e
+            ))
+        })
     }
 }
 impl Transportable for GicDevice {}

arch/src/aarch64/mod.rs

@@ -15,7 +15,6 @@ pub mod uefi;
 
 pub use self::fdt::DeviceInfoForFdt;
 use crate::{DeviceType, GuestMemoryMmap, NumaNodes, PciSpaceInfo, RegionType};
-use gic::GicDevice;
 use log::{log_enabled, Level};
 use std::collections::HashMap;
 use std::convert::TryInto;
@@ -143,7 +142,7 @@ pub fn configure_system<T: DeviceInfoForFdt + Clone + Debug, S: ::std::hash::Bui
     initrd: &Option<super::InitramfsConfig>,
     pci_space_info: &[PciSpaceInfo],
     virtio_iommu_bdf: Option<u32>,
-    gic_device: &dyn GicDevice,
+    gic_device: &gic::GicDevice,
     numa_nodes: &NumaNodes,
     pmu_supported: bool,
 ) -> super::Result<()> {
@@ -153,7 +152,7 @@ pub fn configure_system<T: DeviceInfoForFdt + Clone + Debug, S: ::std::hash::Bui
         vcpu_mpidr,
         vcpu_topology,
         device_info,
-        gic_device,
+        gic_device.get_vgic(),
         initrd,
         pci_space_info,
         numa_nodes,