pyrox.dev
Merge master into staging-next
authored by github-actions[bot] and committed by GitHub c1c8e963 a7e86ba1
+10
-6
pkgs/build-support/vm/default.nix
+10
-6
pkgs/build-support/vm/default.nix
···
5
5
, img ? pkgs.stdenv.hostPlatform.linux-kernel.target
6
6
, storeDir ? builtins.storeDir
7
7
, rootModules ?
8
-
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
8
+
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "virtiofs" "crc32c_generic" ]
9
9
}:
10
10
11
11
let
···
123
123
124
124
echo "mounting Nix store..."
125
125
mkdir -p /fs${storeDir}
126
-
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=131072
126
+
mount -t virtiofs store /fs${storeDir}
127
127
128
128
mkdir -p /fs/tmp /fs/run /fs/var
129
129
mount -t tmpfs -o "mode=1777" none /fs/tmp
···
132
132
133
133
echo "mounting host's temporary directory..."
134
134
mkdir -p /fs/tmp/xchg
135
-
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=131072
135
+
mount -t virtiofs xchg /fs/tmp/xchg
136
136
137
137
mkdir -p /fs/proc
138
138
mount -t proc none /fs/proc
···
222
222
${if (customQemu != null) then customQemu else (qemu-common.qemuBinary qemu)} \
223
223
-nographic -no-reboot \
224
224
-device virtio-rng-pci \
225
-
-virtfs local,path=${storeDir},security_model=none,mount_tag=store \
226
-
-virtfs local,path=xchg,security_model=none,mount_tag=xchg \
225
+
-chardev socket,id=store,path=virtio-store.sock \
226
+
-device vhost-user-fs-pci,chardev=store,tag=store \
227
+
-chardev socket,id=xchg,path=virtio-xchg.sock \
228
+
-device vhost-user-fs-pci,chardev=xchg,tag=xchg \
227
229
''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \
228
230
-kernel ${kernel}/${img} \
229
231
-initrd ${initrd}/initrd \
···
259
261
cat > ./run-vm <<EOF
260
262
#! ${bash}/bin/sh
261
263
''${diskImage:+diskImage=$diskImage}
264
+
${pkgs.virtiofsd}/bin/virtiofsd --xattr --socket-path virtio-store.sock --sandbox none --shared-dir "${storeDir}" &
265
+
${pkgs.virtiofsd}/bin/virtiofsd --xattr --socket-path virtio-xchg.sock --sandbox none --shared-dir xchg &
262
266
${qemuCommand}
263
267
EOF
264
268
···
339
343
args = ["-e" (vmRunCommand qemuCommandLinux)];
340
344
origArgs = args;
341
345
origBuilder = builder;
342
-
QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize}";
346
+
QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize} -object memory-backend-memfd,id=mem,size=${toString memSize}M,share=on -machine memory-backend=mem";
343
347
passAsFile = []; # HACK fix - see https://github.com/NixOS/nixpkgs/issues/16742
344
348
});
345
349