]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Revert "LXC: show used memory as 0 when domain is not active"
authorJim Fehlig <jfehlig@suse.com>
Mon, 10 Aug 2015 18:49:55 +0000 (12:49 -0600)
committerJim Fehlig <jfehlig@suse.com>
Fri, 28 Aug 2015 16:29:12 +0000 (10:29 -0600)
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)

src/lxc/lxc_driver.c
src/qemu/qemu_driver.c

index 979382b2778cff768ad8b93e9bfac5ff881d304d..706b5f4101238c7689781c47c714d99b75f3256b 100644 (file)
@@ -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,
index 9380ede6ef518e6c81637918367f9ac0241ebde8..9b4d9ef32b1e64dcb412ee68fa6170bbaa2773b3 100644 (file)
@@ -2669,7 +2669,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;