November 2024 - Spectrum Development

[PATCH] release/combined: fix for __structuredAttrs
by Alyssa Ross 30 Nov '24

30 Nov '24

When I set __structuredAttrs for this derivation, these variables were no longer passed to the build, resulting in GRUB not getting installed properly. Fixes: 296ccff ("Build images with __structuredAttrs") Signed-off-by: Alyssa Ross <hi(a)alyssa.is> --- release/combined/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/release/combined/default.nix b/release/combined/default.nix index 764e2c3..537c5ef 100644 --- a/release/combined/default.nix +++ b/release/combined/default.nix @@ -60,15 +60,22 @@ let esp = runCommand "esp.img" { nativeBuildInputs = [ grub libfaketime dosfstools mtools ]; - grubTargetDir = "${grub}/lib/grub/${grub.grubTarget}"; - # Definition copied from util/grub-install-common.c. - # Last checked: GRUB 2.06 - pkglib_DATA = [ - "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" "partmap.lst" - "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" "modinfo.sh" - ]; + + env = { + grubTargetDir = "${grub}/lib/grub/${grub.grubTarget}"; + # Definition copied from util/grub-install-common.c. + # Last checked: GRUB 2.06 + pkglib_DATA = lib.escapeShellArgs [ + "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" + "partmap.lst" "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" + "modinfo.sh" + ]; + }; + __structuredAttrs = true; + unsafeDiscardReferences = { out = true; }; + passthru = { inherit grubCfg; }; } '' truncate -s 15M $out base-commit: 741ed49303ffaba63c409962326ab447639e6e20 -- 2.47.0

1 0

[PATCH v1] crosvm: Rename `--vhost-user-gpu` flag in checks
by Dom Rodriguez 12 Nov '24

12 Nov '24

Following on from c9052a4, Alyssa quite rightly pointed out the remaining `--vhost-user-gpu` invocation in the release checks (Wayland). Same principle as c9052a4, just one more replacement to the crosvm flag. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- release/checks/wayland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/checks/wayland/default.nix b/release/checks/wayland/default.nix index d4806db..083e60d 100644 --- a/release/checks/wayland/default.nix +++ b/release/checks/wayland/default.nix @@ -38,7 +38,7 @@ nixosTest ({ lib, pkgs, ... }: { systemd.services.crosvm = { after = [ "crosvm-gpu.service" "weston.service" ]; requires = [ "crosvm-gpu.service" "weston.service" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-fs /run/virtiofsd.sock,tag=virtiofs0 --vhost-user-gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-fs /run/virtiofsd.sock,tag=virtiofs0 --vhost-user gpu,socket=/run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; serviceConfig.ExecStop = "${lib.getExe pkgs.crosvm} stop /run/crosvm"; }; -- 2.44.2

3 3

[PATCH v2] crosvm: Rename `--vhost-user-{fs,gpu}` args
by Dom Rodriguez 11 Nov '24

11 Nov '24

crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`. In this commit, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE,socket=$PATH`, where `$DEVICE` is, in this case, `gpu` or `fs`, and `$PATH` is the path to the Unix socket. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- img/app/Makefile | 4 ++-- release/checks/wayland/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/img/app/Makefile b/img/app/Makefile index 3adf8c4..11ef6e1 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -152,8 +152,8 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd --disk $(RUN_IMG) \ -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ - --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user fs,socket=build/virtiofsd.sock:virtiofs0 \ + --vhost-user gpu,socket=build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ diff --git a/release/checks/wayland/default.nix b/release/checks/wayland/default.nix index d05aa88..a36dbab 100644 --- a/release/checks/wayland/default.nix +++ b/release/checks/wayland/default.nix @@ -29,7 +29,7 @@ nixosTest ({ lib, pkgs, ... }: { systemd.services.crosvm = { after = [ "crosvm-gpu.service" "weston.service" ]; requires = [ "crosvm-gpu.service" "weston.service" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user gpu,socket=/run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; serviceConfig.ExecStop = "${lib.getExe pkgs.crosvm} stop /run/crosvm"; }; -- 2.44.1

3 10

[PATCH v4] crosvm: Rename `--vhost-user-gpu` flag
by Dom Rodriguez 11 Nov '24

11 Nov '24

crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`, of which the former is fixable, but the latter requires some more work. The latter will be patched later on. To mitigate the former, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE,socket=$PATH`, where `$DEVICE` is, in this case, `gpu`, and `$PATH` is the path to the Unix socket. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- The typo gremlins snuck into that last v3 patch, but hopefully v4 will fix it. img/app/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img/app/Makefile b/img/app/Makefile index 2aa78a0..d914cab 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -168,7 +168,7 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user gpu,socket=build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ -- 2.44.1

3 3

[PATCH v3] crosvm: Rename `--vhost-user-gpu` flag
by Dom Rodriguez 09 Nov '24

09 Nov '24

crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`, of which the former is fixable, but the latter requires some more work. The latter will be patched later on. To mitigate the former, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE,socket=$PATH`, where `$DEVICE` is, in this case, `gpu`, and `$PATH` is the path to the Unix socket. Signed-off-by: Dom Rodriguez <shymega(a)shymega.org.uk> --- img/app/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img/app/Makefile b/img/app/Makefile index 7c3e3e8..db9fbea 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -167,7 +167,7 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user gpu socket=build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ -- 2.44.1

2 2