diff --git a/devices/src/interrupt_controller.rs b/devices/src/interrupt_controller.rs index 5922b4de9..8aec2810f 100644 --- a/devices/src/interrupt_controller.rs +++ b/devices/src/interrupt_controller.rs @@ -17,38 +17,38 @@ pub enum Error { #[error("Invalid delivery mode")] InvalidDeliveryMode, /// Failed creating the interrupt source group. - #[error("Failed creating the interrupt source group: {0}")] + #[error("Failed creating the interrupt source group")] CreateInterruptSourceGroup(#[source] io::Error), /// Failed triggering the interrupt. - #[error("Failed triggering the interrupt: {0}")] + #[error("Failed triggering the interrupt")] TriggerInterrupt(#[source] io::Error), /// Failed masking the interrupt. - #[error("Failed masking the interrupt: {0}")] + #[error("Failed masking the interrupt")] MaskInterrupt(#[source] io::Error), /// Failed unmasking the interrupt. - #[error("Failed unmasking the interrupt: {0}")] + #[error("Failed unmasking the interrupt")] UnmaskInterrupt(#[source] io::Error), /// Failed updating the interrupt. - #[error("Failed updating the interrupt: {0}")] + #[error("Failed updating the interrupt")] UpdateInterrupt(#[source] io::Error), /// Failed enabling the interrupt. - #[error("Failed enabling the interrupt: {0}")] + #[error("Failed enabling the interrupt")] EnableInterrupt(#[source] io::Error), #[cfg(target_arch = "aarch64")] /// Failed creating GIC device. - #[error("Failed creating GIC device: {0}")] + #[error("Failed creating GIC device")] CreateGic(#[source] hypervisor::HypervisorVmError), #[cfg(target_arch = "aarch64")] /// Failed restoring GIC device. - #[error("Failed restoring GIC device: {0}")] + #[error("Failed restoring GIC device")] RestoreGic(#[source] hypervisor::arch::aarch64::gic::Error), #[cfg(target_arch = "riscv64")] /// Failed creating AIA device. - #[error("Failed creating AIA device: {0}")] + #[error("Failed creating AIA device")] CreateAia(#[source] hypervisor::HypervisorVmError), #[cfg(target_arch = "riscv64")] /// Failed restoring AIA device. - #[error("Failed restoring AIA device: {0}")] + #[error("Failed restoring AIA device")] RestoreAia(#[source] hypervisor::arch::riscv64::aia::Error), } diff --git a/devices/src/legacy/gpio_pl061.rs b/devices/src/legacy/gpio_pl061.rs index 66a5a5480..c7c66341a 100644 --- a/devices/src/legacy/gpio_pl061.rs +++ b/devices/src/legacy/gpio_pl061.rs @@ -45,7 +45,7 @@ pub enum Error { BadWriteOffset(u64), #[error("GPIO interrupt disabled by guest driver")] GpioInterruptDisabled, - #[error("Could not trigger GPIO interrupt: {0}")] + #[error("Could not trigger GPIO interrupt")] GpioInterruptFailure(#[source] io::Error), #[error("Invalid GPIO Input key triggered: {0}")] GpioTriggerKeyFailure(u32), diff --git a/devices/src/legacy/rtc_pl031.rs b/devices/src/legacy/rtc_pl031.rs index 23e8e7854..39c7911ee 100644 --- a/devices/src/legacy/rtc_pl031.rs +++ b/devices/src/legacy/rtc_pl031.rs @@ -45,7 +45,7 @@ pub const NANOS_PER_SECOND: u64 = 1_000_000_000; pub enum Error { #[error("Bad Write Offset: {0}")] BadWriteOffset(u64), - #[error("Failed to trigger interrupt: {0}")] + #[error("Failed to trigger interrupt")] InterruptFailure(#[source] io::Error), } diff --git a/devices/src/legacy/uart_pl011.rs b/devices/src/legacy/uart_pl011.rs index b1b2bbac9..b5603808b 100644 --- a/devices/src/legacy/uart_pl011.rs +++ b/devices/src/legacy/uart_pl011.rs @@ -53,11 +53,11 @@ pub enum Error { BadWriteOffset(u64), #[error("pl011: DMA not implemented")] DmaNotImplemented, - #[error("Failed to trigger interrupt: {0}")] + #[error("Failed to trigger interrupt")] InterruptFailure(#[source] io::Error), - #[error("Failed to write: {0}")] + #[error("Failed to write")] WriteAllFailure(#[source] io::Error), - #[error("Failed to flush: {0}")] + #[error("Failed to flush")] FlushFailure(#[source] io::Error), } diff --git a/devices/src/pvmemcontrol.rs b/devices/src/pvmemcontrol.rs index 2bb52a9cf..d119a21a1 100644 --- a/devices/src/pvmemcontrol.rs +++ b/devices/src/pvmemcontrol.rs @@ -36,7 +36,7 @@ const MINOR_VERSION: u64 = 0; #[derive(Error, Debug)] pub enum Error { // device errors - #[error("Guest gave us bad memory addresses: {0}")] + #[error("Guest gave us bad memory addresses")] GuestMemory(#[source] GuestMemoryError), #[error("Guest sent us invalid request")] InvalidRequest, @@ -51,7 +51,7 @@ pub enum Error { InvalidArgument(u64), #[error("Unknown function code: {0}")] UnknownFunctionCode(u64), - #[error("Libc call fail: {0}")] + #[error("Libc call fail")] LibcFail(#[source] std::io::Error), } diff --git a/devices/src/pvpanic.rs b/devices/src/pvpanic.rs index 9300b3041..98e7bfa9c 100644 --- a/devices/src/pvpanic.rs +++ b/devices/src/pvpanic.rs @@ -31,9 +31,9 @@ const PVPANIC_CRASH_LOADED: u8 = 1 << 1; #[derive(Debug, Error)] pub enum PvPanicError { - #[error("Failed creating PvPanicDevice: {0}")] + #[error("Failed creating PvPanicDevice")] CreatePvPanicDevice(#[source] anyhow::Error), - #[error("Failed to retrieve PciConfigurationState: {0}")] + #[error("Failed to retrieve PciConfigurationState")] RetrievePciConfigurationState(#[source] anyhow::Error), } diff --git a/devices/src/tpm.rs b/devices/src/tpm.rs index e52887474..c6ed5ce0a 100644 --- a/devices/src/tpm.rs +++ b/devices/src/tpm.rs @@ -18,9 +18,9 @@ use vm_device::BusDevice; #[derive(Error, Debug)] pub enum Error { - #[error("Emulator doesn't implement min required capabilities: {0}")] + #[error("Emulator doesn't implement min required capabilities")] CheckCaps(#[source] anyhow::Error), - #[error("Failed to initialize tpm: {0}")] + #[error("Failed to initialize tpm")] Init(#[source] anyhow::Error), } type Result = anyhow::Result;