diff --git a/arch/src/x86_64/interrupts.rs b/arch/src/x86_64/interrupts.rs index 44c2ccfc3..7664693ef 100644 --- a/arch/src/x86_64/interrupts.rs +++ b/arch/src/x86_64/interrupts.rs @@ -12,12 +12,6 @@ use std::mem; use std::result; use std::sync::Arc; -#[derive(Debug)] -pub enum Error { - GetLapic(anyhow::Error), - SetLapic(anyhow::Error), -} - pub type Result = result::Result; // Defines poached from apicdef.h kernel header. diff --git a/arch/src/x86_64/mod.rs b/arch/src/x86_64/mod.rs index fac51bed9..9aa2a3f7a 100644 --- a/arch/src/x86_64/mod.rs +++ b/arch/src/x86_64/mod.rs @@ -122,9 +122,6 @@ unsafe impl ByteValued for BootParamsWrapper {} #[derive(Debug)] pub enum Error { - /// Invalid e820 setup params. - E820Configuration, - /// Error writing MP table to memory. MpTableSetup(mptable::Error), diff --git a/net_util/src/open_tap.rs b/net_util/src/open_tap.rs index a886ca58d..73cde8c43 100644 --- a/net_util/src/open_tap.rs +++ b/net_util/src/open_tap.rs @@ -27,8 +27,6 @@ pub enum Error { TapSetMac(TapError), /// Getting MAC address failed TapGetMac(TapError), - /// Setting tap interface offload flags failed. - TapSetOffload(TapError), /// Setting vnet header size failed. TapSetVnetHdrSize(TapError), /// Enabling tap interface failed. diff --git a/vhost_user_net/src/lib.rs b/vhost_user_net/src/lib.rs index 625edd455..80716059b 100644 --- a/vhost_user_net/src/lib.rs +++ b/vhost_user_net/src/lib.rs @@ -26,31 +26,20 @@ use std::process; use std::sync::{Arc, Mutex, RwLock}; use std::vec::Vec; use vhost::vhost_user::message::*; -use vhost::vhost_user::{Error as VhostUserError, Listener}; +use vhost::vhost_user::Listener; use vhost_user_backend::{VhostUserBackend, VhostUserDaemon, Vring, VringWorker}; use virtio_bindings::bindings::virtio_net::*; use virtio_bindings::bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap}; use vmm_sys_util::eventfd::EventFd; -pub type VhostUserResult = std::result::Result; pub type Result = std::result::Result; -pub type VhostUserBackendResult = std::result::Result; +type VhostUserBackendResult = std::result::Result; #[derive(Debug)] pub enum Error { - /// Failed to activate device. - BadActivate, /// Failed to create kill eventfd CreateKillEventFd(io::Error), - /// Failed to add event. - EpollCtl(io::Error), - /// Fail to wait event. - EpollWait(io::Error), - /// Failed to create EventFd. - EpollCreateFd, - /// Failed to read Tap. - FailedReadTap, /// Failed to parse configuration string FailedConfigParse(OptionParserError), /// Failed to signal used queue. @@ -59,12 +48,6 @@ pub enum Error { HandleEventNotEpollIn, /// Failed to handle unknown event. HandleEventUnknownEvent, - /// Invalid vring address. - InvalidVringAddr, - /// No vring call fd to notify. - NoVringCallFdNotify, - /// No memory configured. - NoMemoryConfigured, /// Open tap device failed. OpenTap(OpenTapError), /// No socket provided diff --git a/virtio-devices/src/lib.rs b/virtio-devices/src/lib.rs index 6b956a012..749e1c2b8 100644 --- a/virtio-devices/src/lib.rs +++ b/virtio-devices/src/lib.rs @@ -104,27 +104,11 @@ pub type DeviceEventT = u16; #[derive(Debug)] pub enum Error { - FailedReadingQueue { - event_type: &'static str, - underlying: io::Error, - }, FailedSignalingUsedQueue(io::Error), - PayloadExpected, - UnknownEvent { - device: &'static str, - event: DeviceEventT, - }, IoError(io::Error), - EpollCreateFd(io::Error), - EpollCtl(io::Error), - EpollWait(io::Error), - FailedSignalingDriver(io::Error), VhostUserUpdateMemory(vhost_user::Error), VhostUserAddMemoryRegion(vhost_user::Error), - EventfdError(io::Error), SetShmRegionsNotSupported, - EpollHander(String), - NoMemoryConfigured, NetQueuePair(::net_util::NetQueuePairError), ApplySeccompFilter(seccomp::Error), } diff --git a/vm-device/src/lib.rs b/vm-device/src/lib.rs index f5977a161..315f5b04b 100644 --- a/vm-device/src/lib.rs +++ b/vm-device/src/lib.rs @@ -7,19 +7,12 @@ extern crate serde_derive; extern crate vm_memory; -use std::io; - mod bus; pub mod dma_mapping; pub mod interrupt; pub use self::bus::{Bus, BusDevice, Error as BusError}; -#[derive(Debug)] -pub enum Error { - IoError(io::Error), -} - /// Type of Message Signalled Interrupt #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] pub enum MsiIrqType { diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs index 86a02754e..ea443d332 100644 --- a/vmm/src/cpu.rs +++ b/vmm/src/cpu.rs @@ -80,13 +80,6 @@ pub enum Error { /// Cannot patch the CPU ID PatchCpuId(anyhow::Error), - /// The call to KVM_SET_CPUID2 failed. - SetSupportedCpusFailed(anyhow::Error), - - #[cfg(target_arch = "x86_64")] - /// Cannot set the local interruption due to bad configuration. - LocalIntConfiguration(anyhow::Error), - /// Error configuring VCPU VcpuConfiguration(arch::Error), @@ -107,63 +100,6 @@ pub enum Error { /// Asking for more vCPUs that we can have DesiredVCpuCountExceedsMax, - /// Failed to get KVM vcpu lapic. - VcpuGetLapic(anyhow::Error), - - /// Failed to set KVM vcpu lapic. - VcpuSetLapic(anyhow::Error), - - /// Failed to get KVM vcpu MP state. - VcpuGetMpState(anyhow::Error), - - /// Failed to set KVM vcpu MP state. - VcpuSetMpState(anyhow::Error), - - /// Failed to get KVM vcpu msrs. - VcpuGetMsrs(anyhow::Error), - - /// Failed to set KVM vcpu msrs. - VcpuSetMsrs(anyhow::Error), - - /// Failed to get KVM vcpu regs. - VcpuGetRegs(anyhow::Error), - - /// Failed to set KVM vcpu regs. - VcpuSetRegs(anyhow::Error), - - /// Failed to get KVM vcpu sregs. - VcpuGetSregs(anyhow::Error), - - /// Failed to set KVM vcpu sregs. - VcpuSetSregs(anyhow::Error), - - /// Failed to get KVM vcpu events. - VcpuGetVcpuEvents(anyhow::Error), - - /// Failed to set KVM vcpu events. - VcpuSetVcpuEvents(anyhow::Error), - - /// Failed to get KVM vcpu FPU. - VcpuGetFpu(anyhow::Error), - - /// Failed to set KVM vcpu FPU. - VcpuSetFpu(anyhow::Error), - - /// Failed to get KVM vcpu XSAVE. - VcpuGetXsave(anyhow::Error), - - /// Failed to set KVM vcpu XSAVE. - VcpuSetXsave(anyhow::Error), - - /// Failed to get KVM vcpu XCRS. - VcpuGetXcrs(anyhow::Error), - - /// Failed to set KVM vcpu XCRS. - VcpuSetXcrs(anyhow::Error), - - /// Error resuming vCPU on shutdown - ResumeOnShutdown(MigratableError), - /// Cannot create seccomp filter CreateSeccompFilter(seccomp::SeccompError), diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs index e24bf6ed8..8d7f664d9 100644 --- a/vmm/src/lib.rs +++ b/vmm/src/lib.rs @@ -113,10 +113,6 @@ pub enum Error { #[error("Error rebooting VM: {0:?}")] VmReboot(VmError), - /// Cannot shut a VM down - #[error("Error shutting down VM: {0:?}")] - VmShutdown(VmError), - /// Cannot create VMM thread #[error("Error spawning VMM thread {0:?}")] VmmThreadSpawn(#[source] io::Error), @@ -125,10 +121,6 @@ pub enum Error { #[error("Error shutting down VMM: {0:?}")] VmmShutdown(VmError), - // Error following "exe" link - #[error("Error following \"exe\" link: {0}")] - ExePathReadLink(#[source] io::Error), - /// Cannot create seccomp filter #[error("Error creating seccomp filter: {0}")] CreateSeccompFilter(seccomp::SeccompError), diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs index bbad7fcc5..8566dca81 100644 --- a/vmm/src/memory_manager.rs +++ b/vmm/src/memory_manager.rs @@ -162,9 +162,6 @@ pub enum Error { /// Failed to allocate a memory range. MemoryRangeAllocation, - /// Failed to create map region - MmapRegion(), - /// Error from region creation GuestMemoryRegion(MmapRegionError), @@ -195,10 +192,6 @@ pub enum Error { /// Cannot create the system allocator CreateSystemAllocator, - /// The number of external backing files doesn't match the number of - /// memory regions. - InvalidAmountExternalBackingFiles, - /// Invalid SGX EPC section size #[cfg(target_arch = "x86_64")] EpcSectionSizeInvalid, diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index d3ba84efa..6b719ec46 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -132,15 +132,9 @@ pub enum Error { /// Cannot setup terminal in canonical mode. SetTerminalCanon(vmm_sys_util::errno::Error), - /// Failed parsing network parameters - ParseNetworkParameters, - /// Memory is overflow MemOverflow, - /// Failed to allocate the IOAPIC memory range. - IoapicRangeAllocation, - /// Cannot spawn a signal handler thread SignalHandlerSpawn(io::Error), @@ -186,9 +180,6 @@ pub enum Error { /// Memory manager error MemoryManager(MemoryManagerError), - /// No PCI support - NoPciSupport, - /// Eventfd write error EventfdError(std::io::Error), @@ -225,9 +216,6 @@ pub enum Error { /// Failed resizing a memory zone. ResizeZone, - /// Failed setting the VmmOps interface. - SetVmmOpsInterface(hypervisor::HypervisorVmError), - /// Cannot activate virtio devices ActivateVirtioDevices(device_manager::DeviceManagerError),