Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QEMU: Enable xsaveopt cpu feature #278

Merged
merged 2 commits into from
Sep 8, 2021
Merged

QEMU: Enable xsaveopt cpu feature #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c0182d
QEMU: Enable xsaveopt cpu feature
mkroening Sep 7, 2021
f8a42fa
Upgrade to latest QEMU
mkroening Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/hermit_test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def __init__(self,
'-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,
Expand Down