From e2ab6321ed156e0bc9479c118c80db691bff935a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 20 Nov 2021 20:34:06 +0200 Subject: [PATCH 1/2] vmTools: set msize to 128KiB 500KiB was causing issues https://github.com/NixOS/nixpkgs/pull/142577 --- pkgs/build-support/vm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a0f3b5efbaeb..e403b27d9690 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1177,6 +1177,7 @@ rec { # The default 9P msize value is 8 KiB, which according to QEMU is # insufficient and would degrade performance. # See: https://wiki.qemu.org/Documentation/9psetup#msize - # Use 500 KiB as a conservative default, see also https://github.com/NixOS/nixpkgs/pull/142577#issuecomment-953848731 - default9PMsizeBytes = 512000; + # Use 128KiB which is the default in linux 5.15+ + # https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe + default9PMsizeBytes = 128 * 1024; } From 471183f245c3dd85221f5821d570d4fb84c52d5a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 20 Nov 2021 22:21:39 +0200 Subject: [PATCH 2/2] nixos/tests/hibernate: set memorySize to 2G --- nixos/tests/hibernate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 4f05b99a5a11..fc6857e2fd02 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -51,6 +51,7 @@ in makeTest { connect-timeout = 1 ''; + virtualisation.memorySize = 2048; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ # Small root disk for installer