Unverified Commit 8966c60a authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #278

278: QEMU: Enable xsaveopt cpu feature r=stlankes a=mkroening

Fixes https://github.com/hermitcore/libhermit-rs/issues/273

.
Co-authored-by: Martin Kröning's avatarMartin Kröning <mkroening@posteo.net>
parents 6defaf1a f8a42fa7
Pipeline #547057 passed with stages
in 15 minutes and 56 seconds
......@@ -56,14 +56,11 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew update
brew tap-new --no-git hermitcore/homebrew
brew extract --version 6.0.0 qemu hermitcore/homebrew
brew install hermitcore/homebrew/qemu@6.0.0
brew install qemu
- name: Install QEMU, GNU make (windows)
if: ${{ matrix.os == 'windows-latest' }}
run: |
choco install make
choco install qemu --version 2021.5.5
choco install qemu make
echo "C:\Program Files\qemu" >> $GITHUB_PATH
- name: Test kernel
run: qemu-system-aarch64 -semihosting -display none -smp 4 -m 1G -serial stdio -kernel target/aarch64-unknown-hermit-loader/debug/rusty-loader -machine raspi3
......
......@@ -55,15 +55,11 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }}
run: |
brew update
brew tap-new --no-git hermitcore/homebrew
brew extract --version 6.0.0 qemu hermitcore/homebrew
brew install hermitcore/homebrew/qemu@6.0.0
brew install nasm
brew install qemu nasm
- name: Install QEMU, NASM, GNU make (windows)
if: ${{ matrix.os == 'windows-latest' }}
run: |
choco install nasm make
choco install qemu --version 2021.5.5
choco install qemu nasm make
echo "C:\Program Files\qemu" >> $GITHUB_PATH
echo "C:\Program Files\NASM" >> $GITHUB_PATH
- name: Build loader
......@@ -73,7 +69,7 @@ jobs:
- name: Test dev profile
run: |
qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
-cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr \
-cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr \
-kernel loader/target/x86_64-unknown-hermit-loader/release/rusty-loader \
-initrd target/x86_64-unknown-hermit/debug/rusty_demo
- name: Integration tests (ubuntu)
......@@ -86,6 +82,6 @@ jobs:
- name: Test release profile
run: |
qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
-cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr \
-cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr \
-kernel loader/target/x86_64-unknown-hermit-loader/release/rusty-loader \
-initrd target/x86_64-unknown-hermit/release/rusty_demo
......@@ -109,12 +109,12 @@ test:qemu:
-initrd rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo -enable-kvm
- qemu-system-x86_64 -display none -smp 2 -m 64M -serial stdio
-kernel $CI_BUILDS_DIR/loader/target/x86_64-unknown-hermit-loader/debug/rusty-loader
-initrd rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr,rdrand -enable-kvm
-initrd rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand -enable-kvm
- qemu-system-x86_64 -display none -smp 1 -m 64M -serial stdio
-kernel $CI_BUILDS_DIR/loader/target/x86_64-unknown-hermit-loader/release/rusty-loader
-initrd rusty-hermit/target/x86_64-unknown-hermit/release/rusty_demo -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr,rdrand -enable-kvm
-initrd rusty-hermit/target/x86_64-unknown-hermit/release/rusty_demo -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand -enable-kvm
- qemu-system-x86_64 -display none -smp 2 -m 64M -serial stdio
-kernel $CI_BUILDS_DIR/loader/target/x86_64-unknown-hermit-loader/release/rusty-loader
-initrd rusty-hermit/target/x86_64-unknown-hermit/release/rusty_demo -cpu qemu64,apic,fsgsbase,rdtscp,xsave,fxsr,rdrand -enable-kvm
-initrd rusty-hermit/target/x86_64-unknown-hermit/release/rusty_demo -cpu qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr,rdrand -enable-kvm
tags:
- privileged
......@@ -102,7 +102,7 @@ class QemuTestRunner(TestRunner):
'-serial', 'stdio',
'-kernel', bootloader_path,
'-initrd', test_exe_path,
'-cpu', 'qemu64,apic,fsgsbase,rdtscp,xsave,fxsr',
'-cpu', 'qemu64,apic,fsgsbase,rdtscp,xsave,xsaveopt,fxsr',
'-device', 'isa-debug-exit,iobase=0xf4,iosize=0x04',
]
super().__init__(test_command,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment