Merge pull request #2326 from hermit-os/uhyve-init-ioapic

mkroening · web-flow · commit 1f7d12336bb0 · 2026-03-12T22:41:02.000Z
fix(x86_64/apic): initialize I/O APIC on Uhyve
diff --git a/src/arch/x86_64/kernel/apic.rs b/src/arch/x86_64/kernel/apic.rs
@@ -581,11 +581,8 @@ pub fn init() {
 		calibrate_timer();
 	}
 
-	// currently, IO-APIC isn't supported by uhyve
-	if !env::is_uhyve() {
-		// initialize IO-APIC
-		init_ioapic();
-	}
+	// initialize IO-APIC
+	init_ioapic();
 }
 
 fn init_ioapic() {

Original file line number	Diff line number	Diff line change
`@@ -581,11 +581,8 @@ pub fn init() {`
`581`	`581`	`calibrate_timer();`
`582`	`582`	`}`
`583`	`583`
`584`		`- // currently, IO-APIC isn't supported by uhyve`
`585`		`- if !env::is_uhyve() {`
`586`		`- // initialize IO-APIC`
`587`		`- init_ioapic();`
`588`		`- }`
	`584`	`+ // initialize IO-APIC`
	`585`	`+ init_ioapic();`
`589`	`586`	`}`
`590`	`587`
`591`	`588`	`fn init_ioapic() {`