External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-03 20:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: pmem: Derive thiserror::Error

Browse Source 
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2022-09-12 14:47:00 -07:00 committed by Bo Chen
parent 561af4fd1a
commit 9d3ecefc00
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
virtio-devices/src/pmem.rs
View File

@ -18,7 +18,6 @@ use crate::{GuestMemoryMmap, MmapRegion};
use crate::{VirtioInterrupt, VirtioInterruptType}; use crate::{VirtioInterrupt, VirtioInterruptType};
use anyhow::anyhow; use anyhow::anyhow;
use seccompiler::SeccompAction; use seccompiler::SeccompAction;
use std::fmt::{self, Display};
use std::fs::File; use std::fs::File;
use std::io; use std::io;
use std::mem::size_of; use std::mem::size_of;
@ -26,6 +25,7 @@ use std::os::unix::io::AsRawFd;
use std::result; use std::result;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Barrier}; use std::sync::{Arc, Barrier};
use thiserror::Error;
use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize::{VersionMap, Versionize, VersionizeResult};
use versionize_derive::Versionize; use versionize_derive::Versionize;
use virtio_queue::{DescriptorChain, Queue, QueueT}; use virtio_queue::{DescriptorChain, Queue, QueueT};
@ -76,37 +76,22 @@ struct VirtioPmemResp {
// SAFETY: it only has data and has no implicit padding. // SAFETY: it only has data and has no implicit padding.
unsafe impl ByteValued for VirtioPmemResp {} unsafe impl ByteValued for VirtioPmemResp {}
#[derive(Debug)] #[derive(Error, Debug)]
enum Error { enum Error {
/// Guest gave us bad memory addresses. #[error("Bad guest memory addresses: {0}")]
GuestMemory(GuestMemoryError), GuestMemory(GuestMemoryError),
/// Guest gave us a write only descriptor that protocol says to read from. #[error("Unexpected write-only descriptor")]
UnexpectedWriteOnlyDescriptor, UnexpectedWriteOnlyDescriptor,
/// Guest gave us a read only descriptor that protocol says to write to. #[error("Unexpected read-only descriptor")]
UnexpectedReadOnlyDescriptor, UnexpectedReadOnlyDescriptor,
/// Guest gave us too few descriptors in a descriptor chain. #[error("Descriptor chain too short")]
DescriptorChainTooShort, DescriptorChainTooShort,
/// Guest gave us a buffer that was too short to use. #[error("Buffer length too small")]
BufferLengthTooSmall, BufferLengthTooSmall,
/// Guest sent us invalid request. #[error("Invalid request")]
InvalidRequest, InvalidRequest,
} }
impl Display for Error {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use self::Error::*;
match self {
BufferLengthTooSmall => write!(f, "buffer length too small"),
DescriptorChainTooShort => write!(f, "descriptor chain too short"),
GuestMemory(e) => write!(f, "bad guest memory address: {}", e),
InvalidRequest => write!(f, "invalid request"),
UnexpectedReadOnlyDescriptor => write!(f, "unexpected read-only descriptor"),
UnexpectedWriteOnlyDescriptor => write!(f, "unexpected write-only descriptor"),
}
}
}
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
enum RequestType { enum RequestType {
Flush, Flush,