From 911298252ad38b040c261a0055931795f19b222b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Wed, 22 Sep 2021 12:29:24 +0200
Subject: [PATCH] Show cpus and memory in machine list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[NO TESTS NEEDED]

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
---
 cmd/podman/machine/list.go  | 8 +++++++-
 pkg/machine/config.go       | 2 ++
 pkg/machine/qemu/machine.go | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go
index d4360bb9bf..b9dc62d6dc 100644
--- a/cmd/podman/machine/list.go
+++ b/cmd/podman/machine/list.go
@@ -44,6 +44,8 @@ type machineReporter struct {
 	Created string
 	LastUp  string
 	VMType  string
+	CPUs    uint64
+	Memory  string
 }
 
 func init() {
@@ -54,7 +56,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}}\n", "Format volume output using Go template")
 	_ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone)
 	flags.BoolVar(&listFlag.noHeading, "noheading", false, "Do not print headers")
 }
@@ -87,6 +89,8 @@ func outputTemplate(cmd *cobra.Command, responses []*machineReporter) error {
 	headers := report.Headers(machineReporter{}, map[string]string{
 		"LastUp": "LAST UP",
 		"VmType": "VM TYPE",
+		"CPUs":   "CPUS",
+		"Memory": "MEMORY",
 	})
 
 	row := report.NormalizeFormat(listFlag.format)
@@ -136,6 +140,8 @@ 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)
 
 		humanResponses = append(humanResponses, response)
 	}
diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index 8db2335aaa..583eacbaa8 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -58,6 +58,8 @@ type ListResponse struct {
 	LastUp    time.Time
 	Running   bool
 	VMType    string
+	CPUs      uint64
+	Memory    uint64
 }
 
 type SSHOptions struct {
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index d5f5385940..9dfdacb09c 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -574,6 +574,8 @@ func GetVMInfos() ([]*machine.ListResponse, error) {
 
 			listEntry.Name = vm.Name
 			listEntry.VMType = "qemu"
+			listEntry.CPUs = vm.CPUs
+			listEntry.Memory = vm.Memory
 			fi, err := os.Stat(fullPath)
 			if err != nil {
 				return err