jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert msize related commits (#147180)

Browse Source
This commit is contained in:
Artturi 2021-11-24 02:33:53 +02:00 committed by GitHub
parent fb763114e0
commit c4851c0d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -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

1
nixos/tests/hibernate.nix
View File

@ -51,7 +51,6 @@ in makeTest {
connect-timeout = 1
'';
virtualisation.memorySize = 2048;
virtualisation.diskSize = 8 * 1024;
virtualisation.emptyDiskImages = [
# Small root disk for installer

6
nixos/tests/installer.nix
View File

@ -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

11
pkgs/build-support/vm/default.nix
View File

@ -110,7 +110,7 @@ rec {
echo "mounting Nix store..."
mkdir -p /fs${storeDir}
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=${toString default9PMsizeBytes}
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
mkdir -p /fs/tmp /fs/run /fs/var
mount -t tmpfs -o "mode=1777" none /fs/tmp
@ -119,7 +119,7 @@ rec {
echo "mounting host's temporary directory..."
mkdir -p /fs/tmp/xchg
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=${toString default9PMsizeBytes}
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L
mkdir -p /fs/proc
mount -t proc none /fs/proc
@ -1174,11 +1174,4 @@ rec {
`debDistros' sets. */
diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns;
# 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 128KiB which is the default in linux 5.15+
# https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe
# TODO: actually set it to 128KiB, it was causing failures in many tests due to memory usage
default9PMsizeBytes = 16 * 1024;
}