From 1bc63e784878cdd8598bb5be69e47f165f3a24d6 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 3 Oct 2022 15:48:43 +0100 Subject: [PATCH] vmm: Remove legacy I/O ports for ACPI These addresses have been superseded and replaced with other I/O ports. Fixes: #4483 Signed-off-by: Rob Bradford --- vmm/src/device_manager.rs | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 48518e784..1b80c65b2 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -1400,15 +1400,6 @@ impl DeviceManager { { let shutdown_pio_address: u16 = 0x600; - // TODO: Remove the entry for 0x3c0 once all firmwares will have been - // updated with the new value. - self.address_manager - .allocator - .lock() - .unwrap() - .allocate_io_addresses(Some(GuestAddress(0x3c0)), 0x8, None) - .ok_or(DeviceManagerError::AllocateIoPort)?; - self.address_manager .allocator .lock() @@ -1416,13 +1407,6 @@ impl DeviceManager { .allocate_io_addresses(Some(GuestAddress(shutdown_pio_address.into())), 0x8, None) .ok_or(DeviceManagerError::AllocateIoPort)?; - // TODO: Remove the entry for 0x3c0 once all firmwares will have been - // updated with the new value. - self.address_manager - .io_bus - .insert(shutdown_device.clone(), 0x3c0, 0x4) - .map_err(DeviceManagerError::BusError)?; - self.address_manager .io_bus .insert(shutdown_device, shutdown_pio_address.into(), 0x4) @@ -1484,15 +1468,6 @@ impl DeviceManager { { let pm_timer_pio_address: u16 = 0x608; - // TODO: Remove the entry for 0xb008 once all firmwares will have been - // updated with the new value. - self.address_manager - .allocator - .lock() - .unwrap() - .allocate_io_addresses(Some(GuestAddress(0xb008)), 0x4, None) - .ok_or(DeviceManagerError::AllocateIoPort)?; - self.address_manager .allocator .lock() @@ -1500,13 +1475,6 @@ impl DeviceManager { .allocate_io_addresses(Some(GuestAddress(pm_timer_pio_address.into())), 0x4, None) .ok_or(DeviceManagerError::AllocateIoPort)?; - // TODO: Remove the entry for 0xb008 once all firmwares will have been - // updated with the new value. - self.address_manager - .io_bus - .insert(pm_timer_device.clone(), 0xb008, 0x4) - .map_err(DeviceManagerError::BusError)?; - self.address_manager .io_bus .insert(pm_timer_device, pm_timer_pio_address.into(), 0x4)