diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-06-14 11:25:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-06-14 11:25:18 +0000 |
commit | b7966a9d2e768533acac0f37bdeb293c256109d3 (patch) | |
tree | 357a365ecc99e4bec214d084352e316769f70041 /resources/src/lib.rs | |
parent | 1e318da5b57c12f67bed3b528100dbe4ec287ac5 (diff) | |
parent | d42d3fec7a9535b664b89d30fd48c90feda59957 (diff) | |
download | crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.gz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.bz2 crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.lz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.xz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.zst crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'resources/src/lib.rs')
-rw-r--r-- | resources/src/lib.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/resources/src/lib.rs b/resources/src/lib.rs index 6195e91..204227b 100644 --- a/resources/src/lib.rs +++ b/resources/src/lib.rs @@ -40,10 +40,12 @@ pub enum Error { BadAlignment, CreateGpuAllocator(GpuAllocatorError), ExistingAlloc(Alloc), + InvalidAlloc(Alloc), MissingHighMMIOAddresses, MissingLowMMIOAddresses, NoIoAllocator, OutOfSpace, + OutOfBounds, PoolOverflow { base: u64, size: u64 }, PoolSizeZero, RegionOverlap { base: u64, size: u64 }, @@ -60,10 +62,12 @@ impl Display for Error { BadAlignment => write!(f, "Pool alignment must be a power of 2"), CreateGpuAllocator(e) => write!(f, "Failed to create GPU allocator: {:?}", e), ExistingAlloc(tag) => write!(f, "Alloc already exists: {:?}", tag), + InvalidAlloc(tag) => write!(f, "Invalid Alloc: {:?}", tag), MissingHighMMIOAddresses => write!(f, "High MMIO address range not specified"), MissingLowMMIOAddresses => write!(f, "Low MMIO address range not specified"), NoIoAllocator => write!(f, "No IO address range specified"), OutOfSpace => write!(f, "Out of space"), + OutOfBounds => write!(f, "Out of bounds"), PoolOverflow { base, size } => write!(f, "base={} + size={} overflows", base, size), PoolSizeZero => write!(f, "Pool cannot have size of 0"), RegionOverlap { base, size } => { |