From 444e5c2a04f29609f644f0aeef5cea070378f39f Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 15 Apr 2020 17:58:49 +0100 Subject: [PATCH] vmm: device_manager: Generalise NoAvailableVfioDeviceName We now support assigning device ids for VFIO and virtio-pci devices so this error can be generalised. Signed-off-by: Rob Bradford --- vmm/src/device_manager.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 575f5ee11..19eef0fe2 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -233,9 +233,8 @@ pub enum DeviceManagerError { /// Missing PCI bus. NoPciBus, - /// Could not find an available VFIO device name. - #[cfg(feature = "pci_support")] - NoAvailableVfioDeviceName, + /// Could not find an available device name. + NoAvailableDeviceName, /// Missing PCI device. MissingPciDevice, @@ -1648,7 +1647,7 @@ impl DeviceManager { break; } } - Err(DeviceManagerError::NoAvailableVfioDeviceName) + Err(DeviceManagerError::NoAvailableDeviceName) } #[cfg(feature = "pci_support")]