refactor: remove unnecessary usage of anyhow

Prefer proper error types over ambiguous anyhow errors.

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

src/vmm/src/devices/virtio/transport/pci/device.rs

@@ -14,7 +14,6 @@ use std::io::{ErrorKind, Write};
 use std::sync::atomic::{AtomicBool, AtomicU16, AtomicU32, AtomicUsize, Ordering};
 use std::sync::{Arc, Barrier, Mutex};
 
-use anyhow::anyhow;
 use kvm_ioctls::{IoEventAddress, NoDatamatch};
 use log::warn;
 use pci::{
@@ -39,7 +38,7 @@ use crate::devices::virtio::transport::{VirtioInterrupt, VirtioInterruptType};
 use crate::logger::{debug, error};
 use crate::pci::configuration::{PciCapability, PciConfiguration, PciConfigurationState};
 use crate::pci::msix::{MsixCap, MsixConfig, MsixConfigState};
-use crate::pci::{BarReprogrammingParams, PciDevice};
+use crate::pci::{BarReprogrammingParams, DeviceRelocationError, PciDevice};
 use crate::snapshot::Persist;
 use crate::utils::u64_to_usize;
 use crate::vstate::bus::BusDevice;
@@ -251,7 +250,7 @@ pub struct VirtioPciDeviceState {
 #[derive(Debug, thiserror::Error, displaydoc::Display)]
 pub enum VirtioPciDeviceError {
     /// Failed creating VirtioPciDevice: {0}
-    CreateVirtioPciDevice(#[from] anyhow::Error),
+    CreateVirtioPciDevice(#[from] DeviceRelocationError),
     /// Error creating MSI configuration: {0}
     Msi(#[from] InterruptError),
 }
@@ -782,7 +781,7 @@ impl PciDevice for VirtioPciDevice {
         self.configuration.detect_bar_reprogramming(reg_idx, data)
     }
 
-    fn move_bar(&mut self, old_base: u64, new_base: u64) -> Result<(), anyhow::Error> {
+    fn move_bar(&mut self, old_base: u64, new_base: u64) -> Result<(), DeviceRelocationError> {
         // We only update our idea of the bar in order to support free_bars() above.
         // The majority of the reallocation is done inside DeviceManager.
         if self.bar_address == old_base {

src/vmm/src/pci/bus.rs

@@ -458,7 +458,7 @@ mod tests {
     use super::{PciBus, PciConfigIo, PciConfigMmio, PciRoot};
     use crate::pci::bus::{DEVICE_ID_INTEL_VIRT_PCIE_HOST, VENDOR_ID_INTEL};
     use crate::pci::configuration::PciConfiguration;
-    use crate::pci::{BarReprogrammingParams, DeviceRelocation, PciDevice};
+    use crate::pci::{BarReprogrammingParams, DeviceRelocation, DeviceRelocationError, PciDevice};
     use crate::vstate::bus::BusDevice;
 
     #[derive(Debug, Default)]
@@ -479,7 +479,7 @@ mod tests {
             _new_base: u64,
             _len: u64,
             _pci_dev: &mut dyn PciDevice,
-        ) -> Result<(), anyhow::Error> {
+        ) -> Result<(), DeviceRelocationError> {
             self.reloc_cnt
                 .fetch_add(1, std::sync::atomic::Ordering::SeqCst);
             Ok(())

src/vmm/src/pci/mod.rs

@@ -59,11 +59,18 @@ pub trait PciDevice: Send {
         None
     }
     /// Relocates the BAR to a different address in guest address space.
-    fn move_bar(&mut self, _old_base: u64, _new_base: u64) -> Result<(), anyhow::Error> {
+    fn move_bar(&mut self, _old_base: u64, _new_base: u64) -> Result<(), DeviceRelocationError> {
         Ok(())
     }
 }
 
+/// Errors for device manager.
+#[derive(Debug, thiserror::Error, displaydoc::Display)]
+pub enum DeviceRelocationError {
+    /// Device relocation not supported.
+    NotSupported,
+}
+
 /// This trait defines a set of functions which can be triggered whenever a
 /// PCI device is modified in any way.
 pub trait DeviceRelocation: Send + Sync {
@@ -75,5 +82,5 @@ pub trait DeviceRelocation: Send + Sync {
         new_base: u64,
         len: u64,
         pci_dev: &mut dyn PciDevice,
-    ) -> Result<(), anyhow::Error>;
+    ) -> Result<(), DeviceRelocationError>;
 }

src/vmm/src/vstate/vm.rs

@@ -11,7 +11,6 @@ use std::io::Write;
 use std::path::Path;
 use std::sync::{Arc, Mutex, MutexGuard};
 
-use anyhow::anyhow;
 #[cfg(target_arch = "x86_64")]
 use kvm_bindings::KVM_IRQCHIP_IOAPIC;
 use kvm_bindings::{
@@ -27,7 +26,7 @@ use vmm_sys_util::eventfd::EventFd;
 pub use crate::arch::{ArchVm as Vm, ArchVmError, VmState};
 use crate::arch::{GSI_MSI_END, host_page_size};
 use crate::logger::info;
-use crate::pci::{DeviceRelocation, PciDevice};
+use crate::pci::{DeviceRelocation, DeviceRelocationError, PciDevice};
 use crate::persist::CreateSnapshotError;
 use crate::utils::u64_to_usize;
 use crate::vmm_config::snapshot::SnapshotType;
@@ -481,8 +480,8 @@ impl DeviceRelocation for Vm {
         _new_base: u64,
         _len: u64,
         _pci_dev: &mut dyn PciDevice,
-    ) -> Result<(), anyhow::Error> {
-        Err(anyhow!("pci: device relocation not supported"))
+    ) -> Result<(), DeviceRelocationError> {
+        Err(DeviceRelocationError::NotSupported)
     }
 }