openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix memory reporting for inactive domains in the qemu driver. 

Currently, 'info' will always report that mem = max mem. Make sure we
actually return the correct mem value.
This commit is contained in:
Cole Robinson 2009-06-22 16:35:03 +00:00
parent 5ea25b7801
commit 387935345c
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Mon Jun 22 12:33:37 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/qemu_driver.c: Fix memory reporting for inactive domains
in the qemu driver.
Currently, 'info' will always report that mem = max mem. Make sure we
actually return the correct mem value.
Mon Jun 22 12:31:38 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/storage_backend_fs.c src/storage_driver.c:

24
src/qemu_driver.c
View File

@ -2553,16 +2553,22 @@ static int qemudDomainGetInfo(virDomainPtr dom,
}
}
err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon);
if (err < 0)
goto cleanup;
info->maxMem = vm->def->maxmem;
if (err == 0)
/* Balloon not supported, so maxmem is always the allocation */
info->memory = vm->def->maxmem;
else
info->memory = balloon;
if (virDomainIsActive(vm)) {
err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon);
if (err < 0)
goto cleanup;
if (err == 0)
/* Balloon not supported, so maxmem is always the allocation */
info->memory = vm->def->maxmem;
else
info->memory = balloon;
} else {
info->memory = vm->def->memory;
}
info->nrVirtCpu = vm->def->vcpus;
ret = 0;