External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Don't fail virDomainGetInfo if we can't update balloon info

Browse Source 
Qemu driver tries to update balloon data in virDomainGetInfo and if it
can't do so because there is another monitor job running, it just
reports what's known in domain def. However, if there was no job running
but getting the data from qemu fails, we would fail the whole API. This
doesn't make sense. Let's make the failure nonfatal.
This commit is contained in:
Jiri Denemark 2011-10-05 16:07:36 +02:00
parent f045583372
commit fcd2bd55d7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_driver.c
View File

@ -2083,13 +2083,18 @@ static int qemudDomainGetInfo(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
if (err < 0) if (err < 0) {
goto cleanup; /* We couldn't get current memory allocation but that's not
if (err == 0) * a show stopper; we wouldn't get it if there was a job
* active either
*/
info->memory = vm->def->mem.cur_balloon;
} else if (err == 0) {
/* Balloon not supported, so maxmem is always the allocation */ /* Balloon not supported, so maxmem is always the allocation */
info->memory = vm->def->mem.max_balloon; info->memory = vm->def->mem.max_balloon;
else } else {
info->memory = balloon; info->memory = balloon;
}
} else { } else {
info->memory = vm->def->mem.cur_balloon; info->memory = vm->def->mem.cur_balloon;
} }