From 162791b57190974616cb15a13a13220376bc9a57 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Fri, 27 Sep 2019 17:42:00 +0100
Subject: [PATCH] vmm, arch: Use IOAPIC constants from layout in DeviceManager

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 arch/src/x86_64/layout.rs | 1 +
 vmm/src/device_manager.rs | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/src/x86_64/layout.rs b/arch/src/x86_64/layout.rs
index a7e430be8..bbf112f57 100644
--- a/arch/src/x86_64/layout.rs
+++ b/arch/src/x86_64/layout.rs
@@ -75,6 +75,7 @@ pub const MEM_32BIT_DEVICES_SIZE: GuestUsize = (768 << 20);
 
 // IOAPIC
 pub const IOAPIC_START: GuestAddress = GuestAddress(0xfec0_0000);
+pub const IOAPIC_SIZE: GuestUsize = 0x20;
 
 // APIC
 pub const APIC_START: GuestAddress = GuestAddress(0xfee0_0000);
diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index bcbe9e17e..616c7f9c6 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -28,6 +28,7 @@ use qcow::{self, ImageType, QcowFile};
 use std::fs::{File, OpenOptions};
 use std::io::{self, sink, stdout};
 
+use arch::layout::{IOAPIC_SIZE, IOAPIC_START};
 use std::os::unix::fs::OpenOptionsExt;
 use std::os::unix::io::AsRawFd;
 use std::ptr::null_mut;
@@ -44,10 +45,6 @@ use vm_virtio::transport::VirtioPciDevice;
 use vm_virtio::{VirtioSharedMemory, VirtioSharedMemoryList};
 use vmm_sys_util::eventfd::EventFd;
 
-// IOAPIC address range
-const IOAPIC_RANGE_ADDR: u64 = 0xfec0_0000;
-const IOAPIC_RANGE_SIZE: u64 = 0x20;
-
 #[cfg(feature = "mmio_support")]
 const MMIO_LEN: u64 = 0x1000;
 
@@ -311,7 +308,7 @@ impl DeviceManager {
             let ioapic = Arc::new(Mutex::new(ioapic::Ioapic::new(vm_info.vm_fd.clone())));
             buses
                 .mmio
-                .insert(ioapic.clone(), IOAPIC_RANGE_ADDR, IOAPIC_RANGE_SIZE)
+                .insert(ioapic.clone(), IOAPIC_START.0, IOAPIC_SIZE)
                 .map_err(DeviceManagerError::BusError)?;
             Some(ioapic)
         } else {