diff --git a/pkg/machine/hyperv/config.go b/pkg/machine/hyperv/config.go index b55a2f8396..a45346bcff 100644 --- a/pkg/machine/hyperv/config.go +++ b/pkg/machine/hyperv/config.go @@ -50,7 +50,7 @@ func (v HyperVVirtualization) IsValidVMName(name string) (bool, error) { if err != nil { return false, err } - if err := loadMacMachineFromJSON(configDir, &mm); err != nil { + if err := mm.loadHyperVMachineFromJSON(configDir); err != nil { return false, err } // The name is valid for the local filesystem @@ -257,7 +257,7 @@ func (v HyperVVirtualization) loadFromLocalJson() ([]*HyperVMachine, error) { for _, jsonFile := range jsonFiles { mm := HyperVMachine{} - if err := loadMacMachineFromJSON(jsonFile, &mm); err != nil { + if err := mm.loadHyperVMachineFromJSON(jsonFile); err != nil { return nil, err } if err != nil { diff --git a/pkg/machine/hyperv/machine.go b/pkg/machine/hyperv/machine.go index 473676a40d..8f2e898a2f 100644 --- a/pkg/machine/hyperv/machine.go +++ b/pkg/machine/hyperv/machine.go @@ -520,7 +520,7 @@ func (m *HyperVMachine) loadFromFile() (*HyperVMachine, error) { } mm := HyperVMachine{} - if err := loadMacMachineFromJSON(jsonPath, &mm); err != nil { + if err := mm.loadHyperVMachineFromJSON(jsonPath); err != nil { return nil, err } vmm := hypervctl.NewVirtualMachineManager() @@ -555,7 +555,7 @@ func getVMConfigPath(configDir, vmName string) string { return filepath.Join(configDir, fmt.Sprintf("%s.json", vmName)) } -func loadMacMachineFromJSON(fqConfigPath string, macMachine *HyperVMachine) error { +func (m *HyperVMachine) loadHyperVMachineFromJSON(fqConfigPath string) error { b, err := os.ReadFile(fqConfigPath) if err != nil { if errors.Is(err, fs.ErrNotExist) { @@ -563,7 +563,7 @@ func loadMacMachineFromJSON(fqConfigPath string, macMachine *HyperVMachine) erro } return err } - return json.Unmarshal(b, macMachine) + return json.Unmarshal(b, m) } func (m *HyperVMachine) startHostNetworking() (string, machine.APIForwardingState, error) {