[Backport release-21.05] qemu, runInLinuxVM: fix KVM availability check#148029
Merged
alyssais merged 2 commits intoNixOS:release-21.05from Dec 1, 2021
Merged
Conversation
KVM should only be considered abailable if /dev/kvm exists and is read-writable by the user that is trying to launch it. The previous check for existance only had the consequence that on some Linux distributions running VMs with Nix's QEMU only worked if KVM was NOT installed. fixes NixOS#124371 (cherry picked from commit 0463922)
This fixes the qemu-kvm wrapper we add for convenience silently not using KVM, when the system would support it by at least leaving an indication in the log that the build ran slower because it ran without KVM. (cherry picked from commit 5718276)
ofborg
bot
added
10.rebuild-darwin: 11-100
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This backports #125948 to
release-21.05since the label-triggered automatic process for that failed.I removed the change from
-cpu maxto-cpu qemu64(aaecb3b) here since 21.05 has qemu 6.0. and not the 6.1 release, which needs that workaround.I'm assuming
21.05should still get the other changes, please just close this PR if not.