Merge pull request #362 from 00xc/stage2

stage2: refactor stage2

Author: joergroedel

bootlib/src/platform.rs

@@ -12,18 +12,17 @@ pub enum SvsmPlatformType {
     Snp = 1,
 }
 
-impl SvsmPlatformType {
-    pub fn as_u32(&self) -> u32 {
-        match self {
-            Self::Native => 0,
-            Self::Snp => 1,
-        }
-    }
-
-    pub fn from_u32(value: u32) -> Self {
+impl From<u32> for SvsmPlatformType {
+    fn from(value: u32) -> Self {
         match value {
             1 => Self::Snp,
             _ => Self::Native,
         }
     }
 }
+
+impl From<SvsmPlatformType> for u32 {
+    fn from(p: SvsmPlatformType) -> u32 {
+        p as u32
+    }
+}

igvmbuilder/src/stage2_stack.rs

@@ -47,7 +47,7 @@ impl Stage2Stack {
         };
 
         let mut stage2_stack = self.stage2_stack;
-        stage2_stack.platform_type = platform.as_u32();
+        stage2_stack.platform_type = u32::from(platform);
 
         // The native platform does not record VTOM because there is no
         // encryption in native platforms.

kernel/src/error.rs

@@ -26,10 +26,13 @@ use crate::sev::ghcb::GhcbError;
 use crate::sev::msr_protocol::GhcbMsrError;
 use crate::sev::SevSnpError;
 use crate::task::TaskError;
+use elf::ElfError;
 
 /// A generic error during SVSM operation.
 #[derive(Clone, Copy, Debug)]
 pub enum SvsmError {
+    /// Errors during ELF parsing and loading.
+    Elf(ElfError),
     /// Errors related to GHCB
     Ghcb(GhcbError),
     /// Errors related to MSR protocol
@@ -65,3 +68,9 @@ pub enum SvsmError {
     /// Errors from #VC handler
     Vc(VcError),
 }
+
+impl From<ElfError> for SvsmError {
+    fn from(err: ElfError) -> Self {
+        Self::Elf(err)
+    }
+}