Add dev.Validate() back to FromOptions

Author: vyasgun

cmd/vfkit/main.go

@@ -104,10 +104,6 @@ func newVMConfiguration(opts *cmdline.Options) (*config.VirtualMachine, error) {
 		return nil, err
 	}
 
-	if err := vmConfig.ValidateDevices(); err != nil {
-		return nil, err
-	}
-
 	if err := vmConfig.AddIgnitionFileFromCmdLine(opts.IgnitionPath); err != nil {
 		return nil, fmt.Errorf("failed to add ignition file: %w", err)
 	}

pkg/config/config_test.go

@@ -64,7 +64,7 @@ func TestVirtualMachine_ValidateBlockDevices(t *testing.T) {
 	vm.Devices = append(vm.Devices, dev)
 	defer os.Remove(imagePath)
 
-	err = vm.ValidateDevices()
+	err = dev.Validate()
 	require.Error(t, err)
 	require.ErrorContains(t, err, "vfkit does not support qcow2 image format")
 }

pkg/config/virtio.go

@@ -303,7 +303,7 @@ func (dev *VirtioSerial) FromOptions(options []option) error {
 		}
 	}
 
-	return nil
+	return dev.Validate()
 }
 
 // VirtioInputNew creates a new input device for the virtual machine.
@@ -348,7 +348,7 @@ func (dev *VirtioInput) FromOptions(options []option) error {
 			return fmt.Errorf("unknown option for virtio-input devices: %s", option.key)
 		}
 	}
-	return nil
+	return dev.Validate()
 }
 
 // VirtioGPUNew creates a new gpu device for the virtual machine.
@@ -407,7 +407,7 @@ func (dev *VirtioGPU) FromOptions(options []option) error {
 		dev.Height = defaultVirtioGPUResolutionHeight
 	}
 
-	return nil
+	return dev.Validate()
 }
 
 // VirtioNetNew creates a new network device for the virtual machine. It will
@@ -510,7 +510,7 @@ func (dev *VirtioNet) FromOptions(options []option) error {
 		}
 	}
 
-	return nil
+	return dev.Validate()
 }
 
 // VirtioRngNew creates a new random number generator device to feed entropy
@@ -588,7 +588,10 @@ func (dev *VirtioBlk) FromOptions(options []option) error {
 		}
 	}
 
-	return dev.DiskStorageConfig.FromOptions(unhandledOpts)
+	if err := dev.DiskStorageConfig.FromOptions(unhandledOpts); err != nil {
+		return err
+	}
+	return dev.Validate()
 }
 
 func (dev *VirtioBlk) ToCmdLine() ([]string, error) {