[PATCH v1] crosvm: Rename `--vhost-user-gpu` flag in checks
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@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
This patch has been committed as 75c0d383427e624f9497fe0d51b24760a6ea6925, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=75c0d383427e624f9497fe0d51b2.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
Dom Rodriguez <shymega@shymega.org.uk> writes:
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@shymega.org.uk> --- release/checks/wayland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks! I had to edit the commit message a bit, because c9052a4 is not a commit I have — I'm guessing it was your local version? The hash will change when I apply a patch because the committer will change, trailers will be added, etc. While I was there I also changed the subject to conform to the normal Spectrum convention of prefixing commits with the name of the component they're changing ("release/checks/wayland" in this case), which I forgot about on the last one. :) (For single commits that make changes across the tree, I just don't use a prefix.)
On 11.11.2024 11:46, Alyssa Ross wrote:
Dom Rodriguez <shymega@shymega.org.uk> writes:
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@shymega.org.uk> --- release/checks/wayland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks!
np
I had to edit the commit message a bit, because c9052a4 is not a commit I have — I'm guessing it was your local version? The hash will change when I apply a patch because the committer will change, trailers will be added, etc
It was, yeah - thanks for the correction.
While I was there I also changed the subject to conform to the normal Spectrum convention of prefixing commits with the name of the component they're changing ("release/checks/wayland" in this case), which I forgot about on the last one. :) (For single commits that make changes across the tree, I just don't use a prefix.)
Ah, gotcha. Idea for the future: pre-commit-hooks. Best wishes, -- Dom Rodriguez
participants (3)
-
Alyssa Ross -
Alyssa Ross -
Dom Rodriguez