diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 18:47:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-22 18:47:48 -0400 |
commit | 1dba601b56551b301490b36b198477ee0a58d137 (patch) | |
tree | 1e651e0e532ff44727eb8cc92bfbbb5eb98a6f6a /pkg/machine | |
parent | 626df0a54e5dc2e11e287586c9e10c52e0dffe96 (diff) | |
parent | 0baee2cc33000aa8d311d987308849cb2e8420d9 (diff) | |
download | podman-1dba601b56551b301490b36b198477ee0a58d137.tar.gz podman-1dba601b56551b301490b36b198477ee0a58d137.tar.bz2 podman-1dba601b56551b301490b36b198477ee0a58d137.zip |
Merge pull request #11691 from afbjorklund/machine-list
Add more information about the VM to podman machine list
Diffstat (limited to 'pkg/machine')
-rw-r--r-- | pkg/machine/config.go | 3 | ||||
-rw-r--r-- | pkg/machine/qemu/config.go | 2 | ||||
-rw-r--r-- | pkg/machine/qemu/machine.go | 4 |
3 files changed, 9 insertions, 0 deletions
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 |