Bypass shell queting for PCI device ids (crosvm/cloud-hypervisor)

Signed-off-by: Alexander V. Nikolaev <[email protected]>

Author: avnik

lib/runners/cloud-hypervisor.nix

@@ -213,14 +213,14 @@ in {
         })
         else throw "Unsupported interface type ${type} for Cloud-Hypervisor"
       ) interfaces)
-      ++
-      arg "--device" (map ({ bus, path, ... }: {
+    ) 
+    + " " + # Move vfio-pci outside of
+    (lib.concatMapStringsSep " "
+      ({ bus, path, ... }: {
         pci = "path=/sys/bus/pci/devices/${path}";
         usb = throw "USB passthrough is not supported on cloud-hypervisor";
       }.${bus}) devices)
-      ++
-      extraArgs
-    );
+    + " " + lib.escapeShellArgs extraArgs;
 
   canShutdown = socket != null;
 

lib/runners/crosvm.nix

@@ -127,11 +127,6 @@ in {
       #   "--net-vq-pairs" (toString vcpu)
       # ]
       ++
-      builtins.concatMap ({ bus, path, ... }: {
-        pci = [ "--vfio" "/sys/bus/pci/devices/${path},iommu=viommu" ];
-        usb = throw "USB passthrough is not supported on crosvm";
-      }.${bus}) devices
-      ++
       lib.optionals (vsock.cid != null) [
         "--vsock" (toString vsock.cid)
       ]
@@ -140,9 +135,13 @@ in {
         "--initrd" initrdPath
         kernelPath
       ]
-      ++
-      extraArgs
-    );
+    )
+    + " " + # Move vfio-pci outside of
+      (lib.concatMapStringsSep " " ({ bus, path, ... }: {
+        pci = [ "--vfio" "/sys/bus/pci/devices/${path},iommu=viommu" ];
+        usb = throw "USB passthrough is not supported on crosvm";
+      }.${bus}) devices)
+    + " " + lib.escapeShellArgs extraArgs;
 
   canShutdown = socket != null;