Use new psci::smccc error handling rather than smccc library.
Test: Built pvmfw and rialto
Change-Id: I79eb0ca966a6e970dde1c1d73a55db38c549df5c
diff --git a/libs/hyp/src/error.rs b/libs/hyp/src/error.rs
index 20a0cff..4e25e7f 100644
--- a/libs/hyp/src/error.rs
+++ b/libs/hyp/src/error.rs
@@ -14,6 +14,7 @@
//! Error and Result types for hypervisor.
+use crate::KvmError;
use core::{fmt, result};
/// Result type with hypervisor error.
@@ -24,8 +25,8 @@
pub enum Error {
/// MMIO guard is not supported.
MmioGuardNotsupported,
- /// Failed to invoke a certain HVC function.
- HvcError(smccc::Error, u32),
+ /// Failed to invoke a certain KVM HVC function.
+ KvmError(KvmError, u32),
/// The MMIO_GUARD granule used by the hypervisor is not supported.
UnsupportedMmioGuardGranule(usize),
}
@@ -34,7 +35,7 @@
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
Self::MmioGuardNotsupported => write!(f, "MMIO guard is not supported"),
- Self::HvcError(e, function_id) => {
+ Self::KvmError(e, function_id) => {
write!(f, "Failed to invoke the HVC function with function ID {function_id}: {e}")
}
Self::UnsupportedMmioGuardGranule(g) => {