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.

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

nixos/lib/qemu-common.nix: add i686-linux and support x86_64 outside x86_64 #334064

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

RossComputerGuy
Copy link
Member

Description of changes

Necessary because qemu-kvm appears to only supports the host machine. This does not help when an aarch64 machine wants to emulate an x86_64 machine but ends up trying qemu-kvm which runs an QEMU ARM virt machine.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Aug 12, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Aug 12, 2024
@alyssais
Copy link
Member

Partial duplicate of #327349.

@alyssais
Copy link
Member

Why the change to q35?

@RossComputerGuy
Copy link
Member Author

Consistency with otherHostsGuests.x86_64-darwin.x86_64-linux.

otherHostGuestMatrix = {
aarch64-darwin = {
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=2,accel=hvf:tcg -cpu max";
inherit (otherHostGuestMatrix.x86_64-darwin) x86_64-linux;
};
x86_64-darwin = {
x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=hvf:tcg -cpu max";
};
};

@alyssais
Copy link
Member

But not consistency with the way it worked before, for the common case of not cross compiling? Do we have any knowledge of why that one platform uses q35?

@RossComputerGuy
Copy link
Member Author

Do we have any knowledge of why that one platform uses q35?

Via the blame, I found e0fd131. Which #180222 added that in. From @YorikSar:

Mainly Internet research, trial and error. The q35 was suggested by @willcohen in #108984 (comment). Do you think we should document everything that happens in these parameters?

It seems from this, there might've been a case where type=virt caused issue with people on macOS on Apple's M1 chip and changing it to type=q35 fixed that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants