vz: video: allow "default" as an alias for "vz"

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

pkg/vz/vm_darwin.go

@@ -487,7 +487,8 @@ func attachDisks(driver *driver.BaseDriver, vmConfig *vz.VirtualMachineConfigura
 }
 
 func attachDisplay(driver *driver.BaseDriver, vmConfig *vz.VirtualMachineConfiguration) error {
-	if *driver.Yaml.Video.Display == "vz" {
+	switch *driver.Yaml.Video.Display {
+	case "vz", "default":
 		graphicsDeviceConfiguration, err := vz.NewVirtioGraphicsDeviceConfiguration()
 		if err != nil {
 			return err
@@ -501,8 +502,12 @@ func attachDisplay(driver *driver.BaseDriver, vmConfig *vz.VirtualMachineConfigu
 		vmConfig.SetGraphicsDevicesVirtualMachineConfiguration([]vz.GraphicsDeviceConfiguration{
 			graphicsDeviceConfiguration,
 		})
+		return nil
+	case "none":
+		return nil
+	default:
+		return fmt.Errorf("unexpected video display %q", *driver.Yaml.Video.Display)
 	}
-	return nil
 }
 
 func attachFolderMounts(driver *driver.BaseDriver, vmConfig *vz.VirtualMachineConfiguration) error {

pkg/vz/vz_driver_darwin.go

@@ -120,9 +120,10 @@ func (l *LimaVzDriver) Validate() error {
 		logrus.Warnf("field `audio.device` must be %q for VZ driver , got %q", "vz", audioDevice)
 	}
 
-	videoDisplay := *l.Yaml.Video.Display
-	if videoDisplay != "none" && videoDisplay != "vz" {
-		logrus.Warnf("field `video.display` must be %q for VZ driver , got %q", "vz", videoDisplay)
+	switch videoDisplay := *l.Yaml.Video.Display; videoDisplay {
+	case "vz", "default", "none":
+	default:
+		logrus.Warnf("field `video.display` must be \"vz\", \"default\", or \"none\" for VZ driver , got %q", videoDisplay)
 	}
 	return nil
 }
@@ -146,7 +147,12 @@ func (l *LimaVzDriver) Start(ctx context.Context) (chan error, error) {
 }
 
 func (l *LimaVzDriver) CanRunGUI() bool {
-	return *l.Yaml.Video.Display == "vz"
+	switch *l.Yaml.Video.Display {
+	case "vz", "default":
+		return true
+	default:
+		return false
+	}
 }
 
 func (l *LimaVzDriver) RunGUI() error {