4 files changed, 22 insertions, 12 deletions
diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index b3b105150..aaf8da872 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -36,9 +36,9 @@ type InitOptions struct {
 type QemuMachineStatus = string
 
 const (
-	// Running indicates the qemu vm is running
+	// Running indicates the qemu vm is running.
 	Running QemuMachineStatus = "running"
-	//	Stopped indicates the vm has stopped
+	// Stopped indicates the vm has stopped.
 	Stopped            QemuMachineStatus = "stopped"
 	DefaultMachineName string            = "podman-machine-default"
 )
@@ -147,7 +147,7 @@ func (rc RemoteConnectionType) MakeSSHURL(host, path, port, userName string) url
 }
 
 // GetDataDir returns the filepath where vm images should
-// live for podman-machine
+// live for podman-machine.
 func GetDataDir(vmType string) (string, error) {
 	data, err := homedir.GetDataHome()
 	if err != nil {
diff --git a/pkg/machine/fedora.go b/pkg/machine/fedora.go
index b26921b52..bed45c6da 100644
--- a/pkg/machine/fedora.go
+++ b/pkg/machine/fedora.go
@@ -59,7 +59,10 @@ func (f FedoraDownload) Get() *Download {
 func (f FedoraDownload) HasUsableCache() (bool, error) {
 	info, err := os.Stat(f.LocalPath)
 	if err != nil {
-		return false, nil
+		if errors.Is(err, os.ErrNotExist) {
+			return false, nil
+		}
+		return false, err
 	}
 	return info.Size() == f.Size, nil
 }
diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go
index b39334be0..211d96ccb 100644
--- a/pkg/machine/qemu/config.go
+++ b/pkg/machine/qemu/config.go
@@ -61,6 +61,6 @@ type Monitor struct {
 
 var (
 	// defaultQMPTimeout is the timeout duration for the
-	// qmp monitor interactions
+	// qmp monitor interactions.
 	defaultQMPTimeout time.Duration = 2 * time.Second
 )
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 46f838f8b..1bd9fb51b 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -34,7 +34,7 @@ import (
 
 var (
 	qemuProvider = &Provider{}
-	// vmtype refers to qemu (vs libvirt, krun, etc)
+	// vmtype refers to qemu (vs libvirt, krun, etc).
 	vmtype = "qemu"
 )
 
@@ -278,7 +278,9 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
 		fmt.Println("An ignition path was provided.  No SSH connection was added to Podman")
 	}
 	// Write the JSON file
-	v.writeConfig()
+	if err := v.writeConfig(); err != nil {
+		return false, fmt.Errorf("writing JSON file: %w", err)
+	}
 
 	// User has provided ignition file so keygen
 	// will be skipped.
@@ -626,7 +628,8 @@ func (v *MachineVM) Stop(name string, _ machine.StopOptions) error {
 	}
 
 	if err := qmpMonitor.Disconnect(); err != nil {
-		return nil
+		// FIXME: this error should probably be returned
+		return nil // nolint: nilerr
 	}
 
 	disconnected = true
@@ -755,7 +758,8 @@ func (v *MachineVM) isRunning() (bool, error) {
 	// Check if we can dial it
 	monitor, err := qmp.NewSocketMonitor(v.QMPMonitor.Network, v.QMPMonitor.Address, v.QMPMonitor.Timeout)
 	if err != nil {
-		return false, nil
+		// FIXME: this error should probably be returned
+		return false, nil // nolint: nilerr
 	}
 	if err := monitor.Connect(); err != nil {
 		return false, err
@@ -1097,10 +1101,13 @@ func waitAndPingAPI(sock string) {
 		Transport: &http.Transport{
 			DialContext: func(context.Context, string, string) (net.Conn, error) {
 				con, err := net.DialTimeout("unix", sock, apiUpTimeout)
-				if err == nil {
-					con.SetDeadline(time.Now().Add(apiUpTimeout))
+				if err != nil {
+					return nil, err
+				}
+				if err := con.SetDeadline(time.Now().Add(apiUpTimeout)); err != nil {
+					return nil, err
 				}
-				return con, err
+				return con, nil
 			},
 		},
 	}