boot-qemu.sh: Fix aarch64 KVM after cb0698a #63
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
After commit cb0698a ("boot-qemu.sh: Use implementation defined pointer authentication algorithm"), using boot-qemu.sh on AArch64 hardware fails: $ boot-qemu.sh -a arm64 -k ... qemu-system-aarch64: can't apply global max-arm-cpu.pauth-impdef=true: Property 'max-arm-cpu.pauth-impdef' not found This property only applies to TCG, so it should not be applied to KVM. In fact, none of the CPU handling that we have in the aarch64 block applies to KVM, as '-cpu max' is implicitly treated as '-cpu host' when '-enable-kvm' is passed. To make this explicit, add '-cpu host' to the KVM arguments and move all the CPU handling into the non-KVM (TCG) block. Fixes: cb0698a ("boot-qemu.sh: Use implementation defined pointer authentication algorithm") Signed-off-by: Nathan Chancellor <nathan@kernel.org>
nathanchance
requested review from
msfjarvis,
nickdesaulniers and
tpimh
as code owners
msfjarvis
approved these changes
May 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After commit cb0698a ("boot-qemu.sh: Use implementation defined pointer
authentication algorithm"), using
boot-qemu.shon AArch64 hardwarefails:
This property only applies to TCG, so it should not be applied to KVM.
In fact, none of the CPU handling that we have in the aarch64 block
applies to KVM, as '-cpu max' is implicitly treated as '-cpu host' when
'-enable-kvm' is passed. To make this explicit, add '-cpu host' to the
KVM arguments and move all the CPU handling into the non-KVM (TCG)
block.