From f2e90bf0b0ca101d2925e91ca50d3e9e5ea2fdb7 Mon Sep 17 00:00:00 2001
From: Zhuocheng Ding <zhuocheng.ding@intel.corp-partner.google.com>
Date: Mon, 2 Dec 2019 15:50:20 +0800
Subject: Add logic to setup PIC/IOAPIC.

TODO: Route irqfd to PIC/IOAPIC to make them fully work.

BUG=chromium:908689
TEST=None

Change-Id: I301287b1cf32cfccffce6c52ebbb5e123931178e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1945796
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Zhuocheng Ding <zhuocheng.ding@intel.corp-partner.google.com>
---
 aarch64/src/lib.rs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'aarch64/src')

diff --git a/aarch64/src/lib.rs b/aarch64/src/lib.rs
index 67fad72..d4c4a50 100644
--- a/aarch64/src/lib.rs
+++ b/aarch64/src/lib.rs
@@ -21,6 +21,7 @@ use remain::sorted;
 use resources::SystemAllocator;
 use sync::Mutex;
 use sys_util::{EventFd, GuestAddress, GuestMemory, GuestMemoryError};
+use vm_control::VmIrqRequestSocket;
 
 use kvm::*;
 use kvm_sys::kvm_device_attr;
@@ -195,6 +196,7 @@ impl arch::LinuxArch for AArch64 {
     fn build_vm<F, E>(
         mut components: VmComponents,
         _split_irqchip: bool,
+        _ioapic_device_socket: VmIrqRequestSocket,
         serial_parameters: &BTreeMap<u8, SerialParameters>,
         serial_jail: Option<Minijail>,
         create_devices: F,
@@ -314,6 +316,7 @@ impl arch::LinuxArch for AArch64 {
             vcpus,
             vcpu_affinity,
             irq_chip,
+            split_irqchip: None,
             io_bus,
             mmio_bus,
             pid_debug_label_map,
-- 
cgit 1.4.1