build: Merge rust64_start() for coreboot and pvh

This commit merges `rust64_start()` for coreboot and pvh so that the entry function is implemented for each architecture. This commit includes suggested changes in [1]. [1] cloud-hypervisor#203 (comment) Signed-off-by: Akira Moroo <[email protected]>
retrage · Oct 30, 2022 · 5d3dabe · 5d3dabe
1 parent 5fd306a
commit 5d3dabe
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -128,27 +128,19 @@ fn boot_from_device(device: &mut block::VirtioBlockDevice, info: &dyn boot::Info
 }
 
 #[no_mangle]
-#[cfg(not(feature = "coreboot"))]
-pub extern "C" fn rust64_start(rdi: &pvh::StartInfo) -> ! {
+pub extern "C" fn rust64_start(#[cfg(not(feature = "coreboot"))] pvh_info: &pvh::StartInfo) -> ! {
     serial::PORT.borrow_mut().init();
 
     arch::x86_64::sse::enable_sse();
     arch::x86_64::paging::setup();
 
-    main(rdi)
-}
-
-#[no_mangle]
-#[cfg(feature = "coreboot")]
-pub extern "C" fn rust64_start() -> ! {
-    serial::PORT.borrow_mut().init();
-
-    arch::x86_64::sse::enable_sse();
-    arch::x86_64::paging::setup();
+    #[cfg(feature = "coreboot")]
+    let info = &coreboot::StartInfo::default();
 
-    let info = coreboot::StartInfo::default();
+    #[cfg(not(feature = "coreboot"))]
+    let info = pvh_info;
 
-    main(&info)
+    main(info)
 }
 
 fn main(info: &dyn boot::Info) -> ! {