Merge pull request #95956 from matthewbauer/qemu-cpu-max
runInLinuxVM, test-driver: use -cpu max instead of -cpu host
This commit is contained in:
commit
ca3fa9c32a
|
@ -22,9 +22,9 @@ rec {
|
||||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
|
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
|
||||||
|
|
||||||
qemuBinary = qemuPkg: {
|
qemuBinary = qemuPkg: {
|
||||||
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu host";
|
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||||
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
|
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
|
||||||
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
|
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
|
||||||
x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu host";
|
x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||||
}.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm";
|
}.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm";
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,7 @@ let
|
||||||
throw "Non-EFI boot methods are only supported on i686 / x86_64"
|
throw "Non-EFI boot methods are only supported on i686 / x86_64"
|
||||||
else ''
|
else ''
|
||||||
def assemble_qemu_flags():
|
def assemble_qemu_flags():
|
||||||
flags = "-cpu host"
|
flags = "-cpu max"
|
||||||
${if system == "x86_64-linux"
|
${if system == "x86_64-linux"
|
||||||
then ''flags += " -m 768"''
|
then ''flags += " -m 768"''
|
||||||
else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
|
else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
|
||||||
|
|
Loading…
Reference in a new issue