main: Reorganize main function

We now have the protocol name as part of the Info interface.

Signed-off-by: Joe Richey <[email protected]>

Author: josephlr

src/boot.rs

@@ -8,6 +8,8 @@ use crate::{
 
 // Common data needed for all boot paths
 pub trait Info {
+    // Name of for this boot protocol
+    fn name(&self) -> &str;
     // Starting address of the Root System Descriptor Pointer
     fn rsdp_addr(&self) -> u64;
     // The kernel command line (not including null terminator)
@@ -86,6 +88,9 @@ impl Params {
 }
 
 impl Info for Params {
+    fn name(&self) -> &str {
+        "Linux Boot Protocol"
+    }
     fn rsdp_addr(&self) -> u64 {
         self.acpi_rsdp_addr
     }

src/main.rs

@@ -139,17 +139,14 @@ fn boot_from_device(device: &mut block::VirtioBlockDevice, info: &dyn boot::Info
 }
 
 #[no_mangle]
-pub extern "C" fn rust64_start(rdi: Option<&pvh::StartInfo>) -> ! {
-    serial::PORT.borrow_mut().init();
-
-    if let Some(start_info) = rdi {
-        log!("\nBooting via PVH Boot Protocol");
-        run(start_info)
-    }
-    panic!("Unable to determine boot protocol")
+pub extern "C" fn rust64_start(rdi: &pvh::StartInfo) -> ! {
+    main(rdi)
 }
 
-fn run(info: &dyn boot::Info) -> ! {
+fn main(info: &dyn boot::Info) -> ! {
+    serial::PORT.borrow_mut().init();
+    log!("\nBooting with {}", info.name());
+
     enable_sse();
     paging::setup();
 

src/pvh.rs

@@ -31,6 +31,9 @@ struct MemMapEntry {
 }
 
 impl Info for StartInfo {
+    fn name(&self) -> &str {
+        "PVH Boot Protocol"
+    }
     fn rsdp_addr(&self) -> u64 {
         self.rsdp_paddr
     }