fix(env): feature-gate is_uhyve()

Author: mkroening

src/arch/aarch64/kernel/mod.rs

@@ -99,8 +99,14 @@ pub fn boot_next_processor() {
 	#[allow(unused_variables)]
 	let cpu_online = CPU_ONLINE.0.fetch_add(1, Ordering::Release);
 
+	#[allow(clippy::needless_return)]
+	#[cfg(feature = "uhyve")]
+	if crate::env::is_uhyve() {
+		return;
+	}
+
 	#[cfg(all(target_os = "none", feature = "smp"))]
-	if !crate::env::is_uhyve() && get_possible_cpus() > 1 {
+	if get_possible_cpus() > 1 {
 		use core::arch::asm;
 		use core::hint::spin_loop;
 

src/arch/aarch64/kernel/processor.rs

@@ -262,6 +262,7 @@ pub fn supports_2mib_pages() -> bool {
 }
 
 pub fn configure() {
+	#[cfg(feature = "uhyve")]
 	if env::is_uhyve() {
 		return;
 	}

src/arch/riscv64/kernel/mod.rs

@@ -149,11 +149,14 @@ pub fn boot_next_processor() {
 	// TODO: Old: Changing cpu_online will cause uhyve to start the next processor
 	CPU_ONLINE.fetch_add(1, Ordering::Release);
 
-	//When running bare-metal/QEMU we use the firmware to start the next hart
-	if !env::is_uhyve() {
-		let start_addr = (start::_start as *const ()).expose_provenance();
-		sbi_rt::hart_start(next_hart_id as usize, start_addr, 0).unwrap();
+	#[cfg(feature = "uhyve")]
+	if env::is_uhyve() {
+		return;
 	}
+
+	//When running bare-metal/QEMU we use the firmware to start the next hart
+	let start_addr = (start::_start as *const ()).expose_provenance();
+	sbi_rt::hart_start(next_hart_id as usize, start_addr, 0).unwrap();
 }
 
 pub fn print_statistics() {

src/arch/x86_64/kernel/acpi.rs

@@ -517,6 +517,7 @@ pub fn poweroff() {
 }
 
 pub fn init() {
+	#[cfg(feature = "uhyve")]
 	if env::is_uhyve() {
 		return;
 	}

src/arch/x86_64/kernel/apic.rs

@@ -506,19 +506,24 @@ fn default_apic() -> PhysAddr {
 	default_local
 }
 
+fn apic_addr() -> PhysAddr {
+	#[cfg(feature = "uhyve")]
+	if env::is_uhyve() {
+		return default_apic();
+	}
+
+	detect_from_acpi()
+		.or_else(|()| detect_from_mp())
+		.unwrap_or_else(|()| default_apic())
+}
+
 pub fn eoi() {
 	local_apic_write(IA32_X2APIC_EOI, APIC_EOI_ACK);
 }
 
 pub fn init() {
 	// Detect CPUs and APICs.
-	let local_apic_physical_address = if env::is_uhyve() {
-		default_apic()
-	} else {
-		detect_from_acpi()
-			.or_else(|()| detect_from_mp())
-			.unwrap_or_else(|()| default_apic())
-	};
+	let local_apic_physical_address = apic_addr();
 
 	// Initialize x2APIC or xAPIC, depending on what's available.
 	if processor::supports_x2apic() {

src/arch/x86_64/kernel/mod.rs

@@ -110,6 +110,7 @@ pub fn application_processor_init() {
 }
 
 fn finish_processor_init() {
+	#[cfg(feature = "uhyve")]
 	if env::is_uhyve() {
 		// uhyve does not use apic::detect_from_acpi and therefore does not know the number of processors and
 		// their APIC IDs in advance.
@@ -129,15 +130,18 @@ pub fn boot_next_processor() {
 	// to initialize the next processor.
 	let cpu_online = CPU_ONLINE.fetch_add(1, Ordering::Release);
 
-	if !env::is_uhyve() {
-		if cpu_online == 0 {
-			#[cfg(all(target_os = "none", feature = "smp"))]
-			apic::boot_application_processors();
-		}
+	#[cfg(feature = "uhyve")]
+	if env::is_uhyve() {
+		return;
+	}
 
-		if !cfg!(feature = "smp") {
-			apic::print_information();
-		}
+	if cpu_online == 0 {
+		#[cfg(all(target_os = "none", feature = "smp"))]
+		apic::boot_application_processors();
+	}
+
+	if !cfg!(feature = "smp") {
+		apic::print_information();
 	}
 }
 

src/arch/x86_64/kernel/vga.rs

@@ -133,6 +133,7 @@ impl VgaScreen {
 }
 
 pub fn init() {
+	#[cfg(feature = "uhyve")]
 	if crate::env::is_uhyve() {
 		return;
 	}

src/env.rs

@@ -10,7 +10,7 @@ use ahash::RandomState;
 use fdt::Fdt;
 use hashbrown::HashMap;
 use hashbrown::hash_map::Iter;
-use hermit_entry::boot_info::{BootInfo, PlatformInfo, RawBootInfo};
+use hermit_entry::boot_info::{BootInfo, RawBootInfo};
 use hermit_sync::OnceCell;
 use memory_addresses::PhysAddr;
 
@@ -44,7 +44,10 @@ struct Cli {
 }
 
 /// Whether Hermit is running under the "uhyve" hypervisor.
+#[cfg(feature = "uhyve")]
 pub fn is_uhyve() -> bool {
+	use hermit_entry::boot_info::PlatformInfo;
+
 	matches!(boot_info().platform_info, PlatformInfo::Uhyve { .. })
 }