Skip to content

boot-qemu.py: Combine aarch64 machine flags #77

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

Merged
nathanchance merged 1 commit into from
Nov 20, 2022
Merged

boot-qemu.py: Combine aarch64 machine flags #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions boot-qemu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ def get_qemu_args(cfg):
kernel_arch = "arm64"
kernel_image = "Image.gz"
qemu = "qemu-system-aarch64"
qemu_args += ["-machine", "virt,gic-version=max"]
machine = "virt,gic-version=max"

if not use_kvm:
cpu = "max"
Expand All @@ -458,7 +458,11 @@ def get_qemu_args(cfg):
cpu += ",pauth-impdef=true"

qemu_args += ["-cpu", cpu]
qemu_args += ["-machine", "virtualization=true"]
# Boot with VHE emulation, which allows the kernel to run at EL2.
# KVM does not emulate VHE, so this cannot be unconditional.
machine += ",virtualization=true"

qemu_args += ["-machine", machine]

elif arch == "m68k":
append += " console=ttyS0,115200"
Expand Down