Merge #62

62: Enable QEMU debug exit r=stlankes a=mkroening Co-authored-by: Martin Kröning <[email protected]>
hermit-os · Apr 29, 2022 · 9509954 · 9509954
2 parents 3796969 + 71f8141
commit 9509954
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 34 deletions.
diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml
@@ -10,6 +10,10 @@ on:
   schedule:
     - cron: '0 0 * * 6'
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   build:
     name: Test x86_64
@@ -42,42 +46,29 @@ jobs:
     - uses: actions/checkout@v2
       with:
           lfs: true
-    - name: Check Cargo availability
-      run: cargo --version
-    - name: Install qemu/nasm (apt)
-      run: sudo apt-get update --fix-missing && sudo apt-get install qemu-system-x86 nasm
+    - name: Install QEMU, NASM (ubuntu)
       if: ${{ matrix.os == 'ubuntu-latest' }}
-    - name: Install qemu/nasm (macos)
       run: |
-          brew install qemu nasm
-      if: ${{ matrix.os == 'macOS-latest' }}
-    - name: Install nasm (windows)
-      uses: crazy-max/ghaction-chocolatey@v1
-      with:
-          args: install nasm
-      if: ${{ matrix.os == 'windows-latest' }}
-    - name: Install qemu (windows)
-      uses: crazy-max/ghaction-chocolatey@v1
-      with:
-        args: install qemu
-      if: ${{ matrix.os == 'windows-latest' }}
-    - name: Set path to qemu/nasm (Windows)
+        sudo apt-get update
+        sudo apt-get install qemu-system-x86 nasm
+    - name: Install QEMU, NASM (macos)
+      if: ${{ matrix.os == 'macos-latest' }}
       run: |
-          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
+        brew update
+        brew install qemu nasm
+    - name: Install QEMU, NASM, GNU make (windows)
       if: ${{ matrix.os == 'windows-latest' }}
-    - name: Build loader (unix)
-      run: make
-    # Workaround since makefile doesn't work when using powershell
-    - name: Build loader (windows)
       run: |
-          cargo build -Z build-std=core,alloc --target x86_64-unknown-hermit-loader.json
-          $VAR_RUSTC_SYSROOT = (rustc --print sysroot)
-          echo "Sysroot - $VAR_RUSTC_SYSROOT"
-          $LLVM_OBJCOPY = ((Get-ChildItem -Path $VAR_RUSTC_SYSROOT -Include llvm-objcopy.exe -File -Recurse -ErrorAction SilentlyContinue)).Fullname
-          echo "LLVM Objcopy - $LLVM_OBJCOPY"
-          Invoke-Expression "$LLVM_OBJCOPY --strip-debug -O elf32-i386 target/x86_64-unknown-hermit-loader/debug/rusty-loader"
-      if: ${{ matrix.os == 'windows-latest' }}
+        choco install qemu nasm make
+        echo "C:\Program Files\qemu" >> $GITHUB_PATH
+        echo "C:\Program Files\NASM" >> $GITHUB_PATH
+    - name: Build
+      run: make
     - name: Test loader
-      run:
-        qemu-system-x86_64 -display none -smp 1 -m 64M -serial stdio -kernel target/x86_64-unknown-hermit-loader/debug/rusty-loader -initrd data/x86_64/hello_world -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand
+      run: |
+        qemu-system-x86_64 -smp 1 \
+          -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand \
+          -device isa-debug-exit,iobase=0xf4,iosize=0x04 \
+          -display none -m 64M -serial stdio \
+          -kernel target/x86_64-unknown-hermit-loader/debug/rusty-loader \
+          -initrd data/x86_64/hello_world
diff --git a/README.md b/README.md
@@ -20,7 +20,12 @@ Afterwards, the loader is stored in `target/x86_64-unknown-hermit-loader/debug/`
 As final step the unikernel application `app` can be booted with following command:
 
 ```bash
-$ qemu-system-x86_64 -display none -smp 1 -m 64M -serial stdio -kernel path_to_loader/rusty-loader -initrd path_to_app/app -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr
+qemu-system-x86_64 -smp 1 \
+    -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr \
+    -device isa-debug-exit,iobase=0xf4,iosize=0x04 \
+    -display none -m 64M -serial stdio -enable-kvm \
+    -kernel path_to_loader/rusty-loader \
+    -initrd path_to_app/app
 ```
 
 It is important to enable the processor features _fsgsbase_ and _rdtscp_ because it is a prerequisite to boot RustyHermit.