Revert "vmm: Move MemoryManager from I/O ports to MMIO region"

This reverts commit 03108fb88b.
This commit is contained in:
Rob Bradford
2020-01-24 10:36:39 +00:00
committed by Sebastien Boeuf
parent 57ed006992
commit a34893a402
2 changed files with 16 additions and 38 deletions
+8 -7
View File
@@ -523,15 +523,16 @@ impl DeviceManager {
#[cfg(feature = "acpi")]
let memory_manager_clone = memory_manager.clone();
let memory_manager_device_base = memory_manager.lock().unwrap().device_base();
address_manager
.allocator
.lock()
.unwrap()
.allocate_io_addresses(Some(GuestAddress(0x0a00)), 0x18, None)
.ok_or(DeviceManagerError::AllocateIOPort)?;
address_manager
.mmio_bus
.insert(
memory_manager,
memory_manager_device_base.0,
MemoryManager::DEVICE_SIZE,
)
.io_bus
.insert(memory_manager, 0xa00, 0x18)
.map_err(DeviceManagerError::BusError)?;
Ok(DeviceManager {