Merge pull request #11691 from afbjorklund/machine-list

Add more information about the VM to podman machine list

4 files changed, 25 insertions, 7 deletions

diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go
index d4360bb9b..fe9d712e3 100644
--- a/cmd/podman/machine/list.go
+++ b/cmd/podman/machine/list.go
@@ -40,10 +40,13 @@ type listFlagType struct {
 }
 
 type machineReporter struct {
-	Name    string
-	Created string
-	LastUp  string
-	VMType  string
+	Name     string
+	Created  string
+	LastUp   string
+	VMType   string
+	CPUs     uint64
+	Memory   string
+	DiskSize string
 }
 
 func init() {
@@ -54,7 +57,7 @@ func init() {
 
 	flags := lsCmd.Flags()
 	formatFlagName := "format"
-	flags.StringVar(&listFlag.format, formatFlagName, "{{.Name}}\t{{.VMType}}\t{{.Created}}\t{{.LastUp}}\n", "Format volume output using Go template")
+	flags.StringVar(&listFlag.format, formatFlagName, "{{.Name}}\t{{.VMType}}\t{{.Created}}\t{{.LastUp}}\t{{.CPUs}}\t{{.Memory}}\t{{.DiskSize}}\n", "Format volume output using Go template")
 	_ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone)
 	flags.BoolVar(&listFlag.noHeading, "noheading", false, "Do not print headers")
 }
@@ -85,8 +88,11 @@ func list(cmd *cobra.Command, args []string) error {
 
 func outputTemplate(cmd *cobra.Command, responses []*machineReporter) error {
 	headers := report.Headers(machineReporter{}, map[string]string{
-		"LastUp": "LAST UP",
-		"VmType": "VM TYPE",
+		"LastUp":   "LAST UP",
+		"VmType":   "VM TYPE",
+		"CPUs":     "CPUS",
+		"Memory":   "MEMORY",
+		"DiskSize": "DISK SIZE",
 	})
 
 	row := report.NormalizeFormat(listFlag.format)
@@ -136,6 +142,9 @@ func toHumanFormat(vms []*machine.ListResponse) ([]*machineReporter, error) {
 		}
 		response.Created = units.HumanDuration(time.Since(vm.CreatedAt)) + " ago"
 		response.VMType = vm.VMType
+		response.CPUs = vm.CPUs
+		response.Memory = units.HumanSize(float64(vm.Memory) * units.MiB)
+		response.DiskSize = units.HumanSize(float64(vm.DiskSize) * units.GiB)
 
 		humanResponses = append(humanResponses, response)
 	}
diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index 8db2335aa..3ff5c7fe7 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -58,6 +58,9 @@ type ListResponse struct {
 	LastUp    time.Time
 	Running   bool
 	VMType    string
+	CPUs      uint64
+	Memory    uint64
+	DiskSize  uint64
 }
 
 type SSHOptions struct {
diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go
index 3d0fa4094..9f5f45b58 100644
--- a/pkg/machine/qemu/config.go
+++ b/pkg/machine/qemu/config.go
@@ -17,6 +17,8 @@ type MachineVM struct {
 	ImagePath string
 	// Memory in megabytes assigned to the vm
 	Memory uint64
+	// Disk size in gigabytes assigned to the vm
+	DiskSize uint64
 	// Name of the vm
 	Name string
 	// SSH port for user networking
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 3b36985e3..09078fbfb 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -64,6 +64,7 @@ func NewMachine(opts machine.InitOptions) (machine.VM, error) {
 
 	vm.CPUs = opts.CPUS
 	vm.Memory = opts.Memory
+	vm.DiskSize = opts.DiskSize
 
 	// Look up the executable
 	execPath, err := exec.LookPath(QemuCommand)
@@ -574,6 +575,9 @@ func GetVMInfos() ([]*machine.ListResponse, error) {
 
 			listEntry.Name = vm.Name
 			listEntry.VMType = "qemu"
+			listEntry.CPUs = vm.CPUs
+			listEntry.Memory = vm.Memory
+			listEntry.DiskSize = vm.DiskSize
 			fi, err := os.Stat(fullPath)
 			if err != nil {
 				return err