Merge pull request #191 from cfergeau/timesync

timesync: Fix automatic vsock device creation

pkg/vf/vm.go

@@ -103,6 +103,17 @@ func (cfg *VirtualMachineConfiguration) toVz() (*vz.VirtualMachineConfiguration,
 			return nil, err
 		}
 	}
+	if cfg.config.Timesync != nil && cfg.config.Timesync.VsockPort != 0 {
+		// automatically add the vsock device we'll need for communication over VsockPort
+		vsockDev := VirtioVsock{
+			Port:   cfg.config.Timesync.VsockPort,
+			Listen: false,
+		}
+		if err := vsockDev.AddToVirtualMachineConfig(cfg); err != nil {
+			return nil, err
+		}
+	}
+
 	cfg.SetStorageDevicesVirtualMachineConfiguration(cfg.storageDevicesConfiguration)
 	cfg.SetDirectorySharingDevicesVirtualMachineConfiguration(cfg.directorySharingDevicesConfiguration)
 	cfg.SetPointingDevicesVirtualMachineConfiguration(cfg.pointingDevicesConfiguration)
@@ -115,17 +126,6 @@ func (cfg *VirtualMachineConfiguration) toVz() (*vz.VirtualMachineConfiguration,
 	// https://developer.apple.com/documentation/virtualization/vzvirtiosocketdeviceconfiguration?language=objc
 	cfg.SetSocketDevicesVirtualMachineConfiguration(cfg.socketDevicesConfiguration)
 
-	if cfg.config.Timesync != nil && cfg.config.Timesync.VsockPort != 0 {
-		// automatically add the vsock device we'll need for communication over VsockPort
-		vsockDev := VirtioVsock{
-			Port:   cfg.config.Timesync.VsockPort,
-			Listen: false,
-		}
-		if err := vsockDev.AddToVirtualMachineConfig(cfg); err != nil {
-			return nil, err
-		}
-	}
-
 	valid, err := cfg.Validate()
 	if err != nil {
 		return nil, err