Add shim.StopThenStart

Signed-off-by: Jait Jacob <jai8.jacob@gmail.com>

Author: jaitjacob

cmd/podman/machine/restart.go

@@ -14,15 +14,15 @@ import (
 
 var (
 	restartCmd = &cobra.Command{
-	Use:               "restart [MACHINE]",
-	Short:             "Restart an existing machine",
-	Long:              "Restart a managed virtual machine",
-	PersistentPreRunE: machinePreRunE,
-	RunE:              restart,
-	Args:              cobra.MaximumNArgs(1),
-	Example:           `podman machine restart podman-machine-default`,
-	ValidArgsFunction: AutocompleteMachine,
-}
+		Use:               "restart [MACHINE]",
+		Short:             "Restart an existing machine",
+		Long:              "Restart a managed virtual machine",
+		PersistentPreRunE: machinePreRunE,
+		RunE:              restart,
+		Args:              cobra.MaximumNArgs(1),
+		Example:           `podman machine restart podman-machine-default`,
+		ValidArgsFunction: AutocompleteMachine,
+	}
 	restartOpts = machine.StartOptions{}
 )
 
@@ -56,13 +56,12 @@ func restart(_ *cobra.Command, args []string) error {
 		fmt.Printf("Restarting machine %q\n", vmName)
 	}
 
-	newMachineEvent(events.Stop, events.Event{Name: vmName})
-
 	updateConnection := false
-	if err := shim.Start(mc, vmProvider, machine.StartOptions{}, &updateConnection); err != nil {
+	if err := shim.StopThenStart(mc, vmProvider, false, restartOpts, &updateConnection); err != nil {
 		return err
 	}
 	fmt.Printf("Machine %q restarted successfully\n", vmName)
+	newMachineEvent(events.Stop, events.Event{Name: vmName})
 	newMachineEvent(events.Start, events.Event{Name: vmName})
 	return nil
 }

pkg/machine/shim/host.go

@@ -418,6 +418,24 @@ func Stop(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, hardStop bool) e
 	return stopLocked(mc, mp, dirs, hardStop)
 }
 
+// StopThenStart stops and starts the machine while holding its lock.
+func StopThenStart(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, hardStop bool, opts machine.StartOptions, updateSystemConn *bool) error {
+	dirs, err := env.GetMachineDirs(mp.VMType())
+	if err != nil {
+		return err
+	}
+	mc.Lock()
+	defer mc.Unlock()
+	if err := mc.Refresh(); err != nil {
+		return fmt.Errorf("reload config: %w", err)
+	}
+
+	if err := stopLocked(mc, mp, dirs, hardStop); err != nil {
+		return err
+	}
+	return startLocked(mc, mp, dirs, opts, updateSystemConn)
+}
+
 // stopLocked stops the machine and expects the caller to hold the machine's lock.
 func stopLocked(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *machineDefine.MachineDirs, hardStop bool) error {
 	state, err := mp.State(mc, false)
@@ -463,12 +481,6 @@ func stopLocked(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *mach
 }
 
 func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machine.StartOptions, updateSystemConn *bool) error {
-	var updateDefaultConnection bool
-
-	defaultBackoff := 500 * time.Millisecond
-	maxBackoffs := 6
-	signalChanClosed := false
-
 	dirs, err := env.GetMachineDirs(mp.VMType())
 	if err != nil {
 		return err
@@ -481,6 +493,17 @@ func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machine.St
 		return fmt.Errorf("reload config: %w", err)
 	}
 
+	return startLocked(mc, mp, dirs, opts, updateSystemConn)
+}
+
+// startLocked starts the machine and expects the caller to hold the machine's lock.
+func startLocked(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *machineDefine.MachineDirs, opts machine.StartOptions, updateSystemConn *bool) error {
+	var updateDefaultConnection bool
+
+	defaultBackoff := 500 * time.Millisecond
+	maxBackoffs := 6
+	signalChanClosed := false
+
 	connName := mc.Name
 	if mc.HostUser.Rootful {
 		connName += "-root"