git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146783 from Artturin/msize1
commit5e560c4e24db27b73bfe5201d900952680353896 authorArtturi <Artturin@artturin.com> dateSat 20 Nov 2021, 22:49 (5 years ago) parent77e1b5f471183f
2 files changed+4−2
nixos/tests/hibernate.nix+1 pkgs/build-support/vm/default.nix+3−2
nixos/tests/hibernate.nix+1
@@ -51,6 +51,7 @@ in makeTest {
5151 connect-timeout = 1
5252 '';
5353
54+ virtualisation.memorySize = 2048;
5455 virtualisation.diskSize = 8 * 1024;
5556 virtualisation.emptyDiskImages = [
5657 # Small root disk for installer
pkgs/build-support/vm/default.nix+3−2
@@ -1177,6 +1177,7 @@ rec {
11771177 # The default 9P msize value is 8 KiB, which according to QEMU is
11781178 # insufficient and would degrade performance.
11791179 # See: https://wiki.qemu.org/Documentation/9psetup#msize
1180− # Use 500 KiB as a conservative default, see also https://github.com/NixOS/nixpkgs/pull/142577#issuecomment-953848731
1181− default9PMsizeBytes = 512000;
1180+ # Use 128KiB which is the default in linux 5.15+
1181+ # https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe
1182+ default9PMsizeBytes = 128 * 1024;
11821183}