Merge hermit-os#160

160: fix bug by building the minimal version of libhermit r=stlankes a=stlankes

This PR should solve issue hermit-os#157 In addition, I add a small test to build the minimal configuration.

Co-authored-by: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Co-authored-by: Stefan Lankes <stlankes@users.noreply.github.com>

.github/workflows/nightly.yml

@@ -88,6 +88,10 @@ jobs:
           echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo "C:\Program Files\nasm" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         if: ${{ matrix.os == 'windows-latest' }}
+      - name: Building minimal kernel
+        working-directory: libhermit-rs
+        run:
+          cargo build -Z build-std=core,alloc --target x86_64-unknown-hermit-kernel --no-default-features
       - name: Building dev version
         run:
           cargo build -Z build-std=std,core,alloc,panic_abort --target x86_64-unknown-hermit

.gitlab-ci.yml

@@ -58,10 +58,12 @@ build:demo:
 test:integration:
   stage: test
   image: ${CI_REGISTRY_IMAGE}
+  allow_failure: true
   script:
     - lscpu
     - kvm-ok
     - python3 --version
+    - cargo install uhyve
     - HERMIT_LOG_LEVEL_FILTER=Debug cargo test --test '*' --no-fail-fast -Z build-std=core,alloc 
         -Z build-std-features=compiler-builtins-mem --no-default-features --features=pci,acpi 
         --target x86_64-unknown-hermit-kernel -- --uhyve_path=$HOME/.cargo/bin/uhyve --veryverbose
@@ -81,6 +83,7 @@ test:uhyve:
    script:
      - lscpu
      - kvm-ok
+     - cargo install uhyve
      - uhyve -v -c 1 rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo
      - uhyve -v -c 2 rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo
      - uhyve -v -c 1 rusty-hermit/target/x86_64-unknown-hermit/release/rusty_demo

Dockerfile

@@ -9,7 +9,6 @@ RUN apt-get update && \
 # Install Rust toolchain
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly --profile minimal
 RUN /root/.cargo/bin/cargo install cargo-download
-RUN /root/.cargo/bin/cargo install uhyve
 RUN /root/.cargo/bin/rustup component add rust-src
 RUN /root/.cargo/bin/rustup component add llvm-tools-preview
 

src/drivers/net/mod.rs

@@ -13,6 +13,7 @@ pub mod virtio_net;
 
 use crate::arch::kernel::apic;
 use crate::arch::kernel::irq::ExceptionStackFrame;
+#[cfg(feature = "pci")]
 use crate::arch::kernel::pci;
 use crate::arch::kernel::percore::*;
 use crate::scheduler::task::TaskHandle;
@@ -145,13 +146,16 @@ pub extern "x86-interrupt" fn network_irqhandler(_stack_frame: &mut ExceptionSta
 	debug!("Receive network interrupt");
 	apic::eoi();
 
+	#[cfg(feature = "pci")]
 	let check_scheduler = match pci::get_network_driver() {
 		Some(driver) => driver.lock().handle_interrupt(),
 		_ => {
 			debug!("Unable to handle interrupt!");
 			false
 		}
 	};
+	#[cfg(not(feature = "pci"))]
+	let check_scheduler = false;
 
 	if check_scheduler {
 		core_scheduler().scheduler();