Merge pull request #383 from SuperSandro2000/withDriveLetters-less-imports

Reduce imports of the same file

Author: SuperSandro2000

lib/runner.nix

@@ -8,13 +8,13 @@ let
 
   inherit (microvmConfig) hostName;
 
-  inherit (import ./. { inherit lib; }) createVolumesScript makeMacvtap;
+  inherit (import ./. { inherit lib; }) createVolumesScript makeMacvtap withDriveLetters;
   inherit (makeMacvtap {
     inherit microvmConfig hypervisorConfig;
   }) openMacvtapFds macvtapFds;
 
   hypervisorConfig = import (./runners + "/${microvmConfig.hypervisor}.nix") {
-    inherit pkgs microvmConfig macvtapFds;
+    inherit pkgs microvmConfig macvtapFds withDriveLetters;
   };
 
   inherit (hypervisorConfig) command canShutdown shutdownCommand;

lib/runners/qemu.nix

@@ -1,6 +1,7 @@
 { pkgs
 , microvmConfig
 , macvtapFds
+, withDriveLetters
 }:
 
 let
@@ -50,7 +51,6 @@ let
   inherit (microvmConfig) hostName vcpu mem balloon initialBalloonMem deflateOnOOM hotplugMem hotpluggedMem user interfaces shares socket forwardPorts devices vsock graphics storeOnDisk kernel initrdPath storeDisk;
   inherit (microvmConfig.qemu) machine extraArgs serialConsole;
 
-  inherit (import ../. { inherit (pkgs) lib; }) withDriveLetters;
 
   volumes = withDriveLetters microvmConfig;
 

lib/runners/stratovirt.nix

@@ -1,6 +1,7 @@
 { pkgs
 , microvmConfig
 , macvtapFds
+, withDriveLetters
 }:
 
 let
@@ -14,7 +15,6 @@ let
 
   tapMultiQueue = vcpu > 1;
 
-  inherit (import ../. { inherit (pkgs) lib; }) withDriveLetters;
   volumes = withDriveLetters microvmConfig;
 
   # PCI required by vfio-pci for PCI passthrough