diff options
| author | Jim Fehlig <jfehlig@suse.com> | 2015-08-10 12:49:55 -0600 |
|---|---|---|
| committer | Jim Fehlig <jfehlig@suse.com> | 2015-08-28 10:24:06 -0600 |
| commit | 0107209104204ea74953d3203672f08883f57ac1 (patch) | |
| tree | e206854f2a094380472664055a515ddae0460db0 | |
| parent | 4ecffe773d2438ce99ab2dfed07b4c7994091114 (diff) | |
| download | libvirt-0107209104204ea74953d3203672f08883f57ac1.tar.gz | |
Revert "LXC: show used memory as 0 when domain is not active"
This reverts commit 1ce7c1d20cfd5afb26d2dbc88201085d52415d0e,
which introduced a significant semantic change to the
virDomainGetInfo() API. Additionally, the change was only
made to 2 of the 15 virt drivers.
Conflicts:
src/qemu/qemu_driver.c
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
(cherry picked from commit 60acb38abbee1636a9cddf8d296f700d115c8f77)
| -rw-r--r-- | src/lxc/lxc_driver.c | 2 | ||||
| -rw-r--r-- | src/qemu/qemu_driver.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 66d708af1c..a0a372bc1a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -584,7 +584,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, if (!virDomainObjIsActive(vm)) { info->cpuTime = 0; - info->memory = 0; + info->memory = vm->def->mem.cur_balloon; } else { if (virCgroupGetCpuacctUsage(priv->cgroup, &(info->cpuTime)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5a2bf3982c..f88803b237 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2587,7 +2587,7 @@ static int qemuDomainGetInfo(virDomainPtr dom, info->memory = vm->def->mem.cur_balloon; } } else { - info->memory = 0; + info->memory = vm->def->mem.cur_balloon; } info->nrVirtCpu = vm->def->vcpus; |