cloud-hypervisor sockets: use spectrum names

- CONNECT.sock → vsock.sock
- ch.sock → vmm.sock

profiles/ch-runner.nix

@@ -51,8 +51,8 @@ in
           "--cmdline=${lib.concatStringsSep " " cfg.cmdline}"
           "--kernel=${config.boot.kernelPackages.kernel}/${pkgs.stdenv.hostPlatform.linux-kernel.target}"
           "--initramfs=${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"
-          "--vsock=cid=4,socket=CONNECT.sock"
-          "--api-socket=ch.sock"
+          "--vsock=cid=4,socket=vsock.sock"
+          "--api-socket=vmm.sock"
           "--serial=tty"
           "--console=null"
           "--watchdog"
@@ -69,7 +69,7 @@ in
         mkdir -p "$HOME/uvms/$GUESTNAME"
         cd "$HOME/uvms/$GUESTNAME"
         cleanup() {
-            rm "$HOME/uvms/$GUESTNAME"/{ch,CONNECT}.sock
+            rm "$HOME/uvms/$GUESTNAME"/{vmm,vsock}.sock
         }
         exec -a "uuvm/$GUESTNAME" "''${args[@]}"
       '';

profiles/uvms-guest.nix

@@ -54,8 +54,8 @@ in
       ];
       systemd.services."microvm@".serviceConfig.ExecStartPost = [
         (pkgs.writeShellScript "microvm-fix-umask" ''
-          if [[ -e CONNECT.sock ]] ; then
-            chmod g+rw CONNECT.sock
+          if [[ -e vsock.sock ]] ; then
+            chmod g+rw vsock.sock
           fi
         '')
       ];

profiles/vsock-connect-guest.nix

@@ -12,7 +12,7 @@ in
     (mkIfGuest {
       microvm.cloud-hypervisor.extraArgs = [
         "--vsock"
-        "cid=4,socket=CONNECT.sock"
+        "cid=4,socket=vsock.sock"
       ];
     })
     {