Skip to content
Snippets Groups Projects
Unverified Commit 56374702 authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #725


725: don't initialize IO-APIC for uhyve r=jounathaen a=stlankes

uhyve doesn't support a common IO-APIC. Consequently, libhermit should not initialize the IO-APIC

Co-authored-by: Stefan Lankes's avatarStefan Lankes <slankes@eonerc.rwth-aachen.de>
parents eef2291e 32510fd5
No related branches found
No related tags found
No related merge requests found
Pipeline #970058 passed
......@@ -438,7 +438,8 @@ fn detect_from_uhyve() -> Result<PhysAddr, ()> {
if env::is_uhyve() {
let default_address = PhysAddr(0xFEE0_0000);
init_ioapic_address(default_address);
// currently, uhyve doesn't support an IO-APIC
//init_ioapic_address(default_address);
Ok(default_address)
} else {
......@@ -507,8 +508,11 @@ pub fn init() {
calibrate_timer();
}
// init ioapic
init_ioapic();
// currently, IO-APIC isn't supported by uhyve
if !env::is_uhyve() {
// initialize IO-APIC
init_ioapic();
}
}
fn init_ioapic() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment