diff options
| author | Artturi <Artturin@artturin.com> | 2021-11-24 02:33:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 02:33:53 +0200 |
| commit | c4851c0d710c39e54d7ee0b8e522e136f290f09d (patch) | |
| tree | df2d616d3dca0dc6dc3453dbc42ec92f05e18d30 /nixos | |
| parent | fb763114e0afb3e83bcc20cd2518143b669aefce (diff) | |
| download | nixpkgs-c4851c0d710c39e54d7ee0b8e522e136f290f09d.tar nixpkgs-c4851c0d710c39e54d7ee0b8e522e136f290f09d.tar.gz nixpkgs-c4851c0d710c39e54d7ee0b8e522e136f290f09d.tar.bz2 nixpkgs-c4851c0d710c39e54d7ee0b8e522e136f290f09d.tar.lz nixpkgs-c4851c0d710c39e54d7ee0b8e522e136f290f09d.tar.xz nixpkgs-c4851c0d710c39e54d7ee0b8e522e136f290f09d.tar.zst nixpkgs-c4851c0d710c39e54d7ee0b8e522e136f290f09d.zip | |
Revert msize related commits (#147180)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/hibernate.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 493c407222f..91356ac1d98 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -306,7 +306,7 @@ in virtualisation.msize = mkOption { type = types.ints.positive; - default = pkgs.vmTools.default9PMsizeBytes; + default = 16384; description = '' The msize (maximum packet size) option passed to 9p file systems, in diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index fc6857e2fd0..4f05b99a5a1 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -51,7 +51,6 @@ in makeTest { connect-timeout = 1 ''; - virtualisation.memorySize = 2048; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ # Small root disk for installer diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 0748a74ee17..513d2506e94 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -76,8 +76,8 @@ let def assemble_qemu_flags(): flags = "-cpu max" ${if (system == "x86_64-linux" || system == "i686-linux") - then ''flags += " -m 1500"'' - else ''flags += " -m 1000 -enable-kvm -machine virt,gic-version=host"'' + then ''flags += " -m 1024"'' + else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"'' } return flags @@ -288,7 +288,7 @@ let # builds stuff in the VM, needs more juice virtualisation.diskSize = 8 * 1024; virtualisation.cores = 8; - virtualisation.memorySize = 3096; + virtualisation.memorySize = 1536; # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is |