2 files changed, 17 insertions, 11 deletions
diff --git a/pkg/machine/qemu/config_test.go b/pkg/machine/qemu/config_test.go
index 0fbb5b3bf..3f92881fa 100644
--- a/pkg/machine/qemu/config_test.go
+++ b/pkg/machine/qemu/config_test.go
@@ -68,9 +68,15 @@ func TestNewMachineFile(t *testing.T) {
 
 	p := "/var/tmp/podman/my.sock"
 	longp := filepath.Join(longTemp, utils.RandomString(100), "my.sock")
-	os.MkdirAll(filepath.Dir(longp), 0755)
-	f, _ := os.Create(longp)
-	f.Close()
+	err = os.MkdirAll(filepath.Dir(longp), 0755)
+	if err != nil {
+		panic(err)
+	}
+	f, err := os.Create(longp)
+	if err != nil {
+		panic(err)
+	}
+	_ = f.Close()
 	sym := "my.sock"
 	longSym := filepath.Join(homedir, ".podman", sym)
 
@@ -120,14 +126,15 @@ func TestNewMachineFile(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := machine.NewMachineFile(tt.args.path, tt.args.symlink) //nolint: scopelint
-			if (err != nil) != tt.wantErr {                                   //nolint: scopelint
-				t.Errorf("NewMachineFile() error = %v, wantErr %v", err, tt.wantErr) //nolint: scopelint
+			got, err := machine.NewMachineFile(tt.args.path, tt.args.symlink)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("NewMachineFile() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(got, tt.want) { //nolint: scopelint
-				t.Errorf("NewMachineFile() got = %v, want %v", got, tt.want) //nolint: scopelint
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewMachineFile() got = %v, want %v", got, tt.want)
 			}
 		})
 	}
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 35eea5fb4..91e15c2af 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -484,12 +484,11 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
 	if err := v.writeConfig(); err != nil {
 		return fmt.Errorf("writing JSON file: %w", err)
 	}
-	defer func() error {
+	defer func() {
 		v.Starting = false
 		if err := v.writeConfig(); err != nil {
-			return fmt.Errorf("writing JSON file: %w", err)
+			logrus.Errorf("Writing JSON file: %v", err)
 		}
-		return nil
 	}()
 	if v.isIncompatible() {
 		logrus.Errorf("machine %q is incompatible with this release of podman and needs to be recreated, starting for recovery only", v.Name)