File 60acb38-revert-curmem-inactive-dom.patch of Package libvirt

Overview Repositories Revisions Requests Users Attributes Meta

File 60acb38-revert-curmem-inactive-dom.patch of Package libvirt (Revision 36a1b7a317706e172d647cc996188e06)

Currently displaying revision 36a1b7a317706e172d647cc996188e06 , Show latest

commit 60acb38abbee1636a9cddf8d296f700d115c8f77
Author: Jim Fehlig <jfehlig@suse.com>
Date:   Mon Aug 10 12:49:55 2015 -0600

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>

Index: libvirt-1.2.18/src/lxc/lxc_driver.c
===================================================================
--- libvirt-1.2.18.orig/src/lxc/lxc_driver.c
+++ libvirt-1.2.18/src/lxc/lxc_driver.c
@@ -597,7 +597,7 @@ static int lxcDomainGetInfo(virDomainPtr
 
     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: libvirt-1.2.18/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.2.18.orig/src/qemu/qemu_driver.c
+++ libvirt-1.2.18/src/qemu/qemu_driver.c
@@ -2641,13 +2641,13 @@ qemuDomainGetInfo(virDomainPtr dom,
         goto cleanup;
     }
 
-    if (virDomainObjIsActive(vm)) {
-        if (VIR_ASSIGN_IS_OVERFLOW(info->memory, vm->def->mem.cur_balloon)) {
-            virReportError(VIR_ERR_OVERFLOW, "%s",
-                           _("Current memory size too large"));
-            goto cleanup;
-        }
+    if (VIR_ASSIGN_IS_OVERFLOW(info->memory, vm->def->mem.cur_balloon)) {
+        virReportError(VIR_ERR_OVERFLOW, "%s",
+                       _("Current memory size too large"));
+        goto cleanup;
+    }
 
+    if (virDomainObjIsActive(vm)) {
         if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) {
             virReportError(VIR_ERR_OPERATION_FAILED, "%s",
                            _("cannot read cputime for domain"));

Places

File 60acb38-revert-curmem-inactive-dom.patch of Package libvirt (Revision 36a1b7a317706e172d647cc996188e06)

Places