Merge pull request #146783 from Artturin/msize1

authored by Artturi and committed by GitHub 5e560c4e 77e1b5f8

+4 -2
+1
nixos/tests/hibernate.nix
··· 51 51 connect-timeout = 1 52 52 ''; 53 53 54 + virtualisation.memorySize = 2048; 54 55 virtualisation.diskSize = 8 * 1024; 55 56 virtualisation.emptyDiskImages = [ 56 57 # Small root disk for installer
+3 -2
pkgs/build-support/vm/default.nix
··· 1177 1177 # The default 9P msize value is 8 KiB, which according to QEMU is 1178 1178 # insufficient and would degrade performance. 1179 1179 # 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; 1182 1183 }