2 files changed, 97 insertions, 3 deletions

diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go
index 518e7490f..2d0afbf05 100644
--- a/cmd/podman/machine/init.go
+++ b/cmd/podman/machine/init.go
@@ -5,6 +5,7 @@ package machine
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/podman/v4/cmd/podman/registry"
@@ -94,7 +95,7 @@ func init() {
 	_ = initCmd.RegisterFlagCompletionFunc(ImagePathFlagName, completion.AutocompleteDefault)
 
 	VolumeFlagName := "volume"
-	flags.StringArrayVarP(&initOpts.Volumes, VolumeFlagName, "v", []string{}, "Volumes to mount, source:target")
+	flags.StringArrayVarP(&initOpts.Volumes, VolumeFlagName, "v", cfg.Machine.Volumes, "Volumes to mount, source:target")
 	_ = initCmd.RegisterFlagCompletionFunc(VolumeFlagName, completion.AutocompleteDefault)
 
 	VolumeDriverFlagName := "volume-driver"
@@ -112,9 +113,10 @@ func init() {
 // TODO should we allow for a users to append to the qemu cmdline?
 func initMachine(cmd *cobra.Command, args []string) error {
 	var (
-		vm  machine.VM
 		err error
+		vm  machine.VM
 	)
+
 	provider := getSystemDefaultProvider()
 	initOpts.Name = defaultMachineName
 	if len(args) > 0 {
@@ -126,7 +128,9 @@ func initMachine(cmd *cobra.Command, args []string) error {
 	if _, err := provider.LoadVMByName(initOpts.Name); err == nil {
 		return errors.Wrap(machine.ErrVMAlreadyExists, initOpts.Name)
 	}
-
+	for idx, vol := range initOpts.Volumes {
+		initOpts.Volumes[idx] = os.ExpandEnv(vol)
+	}
 	vm, err = provider.NewMachine(initOpts)
 	if err != nil {
 		return err
diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go
new file mode 100644
index 000000000..d43cabf6b
--- /dev/null
+++ b/cmd/podman/machine/inspect.go
@@ -0,0 +1,90 @@
+//go:build amd64 || arm64
+// +build amd64 arm64
+
+package machine
+
+import (
+	"encoding/json"
+	"os"
+
+	"github.com/containers/podman/v4/cmd/podman/common"
+	"github.com/containers/podman/v4/cmd/podman/registry"
+	"github.com/containers/podman/v4/cmd/podman/utils"
+	"github.com/containers/podman/v4/libpod/define"
+	"github.com/containers/podman/v4/pkg/machine"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+var (
+	inspectCmd = &cobra.Command{
+		Use:               "inspect [options] [MACHINE...]",
+		Short:             "Inspect an existing machine",
+		Long:              "Provide details on a managed virtual machine",
+		RunE:              inspect,
+		Example:           `podman machine inspect myvm`,
+		ValidArgsFunction: autocompleteMachine,
+	}
+	inspectFlag = inspectFlagType{}
+)
+
+type inspectFlagType struct {
+	format string
+}
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Command: inspectCmd,
+		Parent:  machineCmd,
+	})
+
+	flags := inspectCmd.Flags()
+	formatFlagName := "format"
+	flags.StringVar(&inspectFlag.format, formatFlagName, "", "Format volume output using JSON or a Go template")
+	_ = inspectCmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteFormat(machine.InspectInfo{}))
+}
+
+func inspect(cmd *cobra.Command, args []string) error {
+	var (
+		errs utils.OutputErrors
+	)
+	if len(args) < 1 {
+		args = append(args, defaultMachineName)
+	}
+	vms := make([]machine.InspectInfo, 0, len(args))
+	provider := getSystemDefaultProvider()
+	for _, vmName := range args {
+		vm, err := provider.LoadVMByName(vmName)
+		if err != nil {
+			errs = append(errs, err)
+			continue
+		}
+		state, err := vm.State()
+		if err != nil {
+			errs = append(errs, err)
+			continue
+		}
+		ii := machine.InspectInfo{
+			State: state,
+			VM:    vm,
+		}
+		vms = append(vms, ii)
+	}
+	if len(inspectFlag.format) > 0 {
+		// need jhonce to work his template magic
+		return define.ErrNotImplemented
+	}
+	if err := printJSON(vms); err != nil {
+		logrus.Error(err)
+	}
+	return errs.PrintErrors()
+}
+
+func printJSON(data []machine.InspectInfo) error {
+	enc := json.NewEncoder(os.Stdout)
+	// by default, json marshallers will force utf=8 from
+	// a string. this breaks healthchecks that use <,>, &&.
+	enc.SetEscapeHTML(false)
+	enc.SetIndent("", "     ")
+	return enc.Encode(data)
+}