External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only call qemuMonitorGetMemoryStats for virtio memballoon

Browse Source 
There is nothing to get from the monitor for model='none'.
This commit is contained in:
Ján Tomko 2015-06-03 17:02:42 +02:00
parent 4bfc58b58d
commit 09ebc10fe1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_driver.c
View File

@ -11599,14 +11599,19 @@ qemuDomainMemoryStats(virDomainPtr dom,
goto endjob; goto endjob;
} }
priv = vm->privateData; if (vm->def->memballoon &&
qemuDomainObjEnterMonitor(driver, vm); vm->def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) {
ret = qemuMonitorGetMemoryStats(priv->mon, stats, nr_stats); priv = vm->privateData;
if (qemuDomainObjExitMonitor(driver, vm) < 0) qemuDomainObjEnterMonitor(driver, vm);
ret = -1; ret = qemuMonitorGetMemoryStats(priv->mon, stats, nr_stats);
if (qemuDomainObjExitMonitor(driver, vm) < 0)
ret = -1;
if (ret < 0 || ret >= nr_stats) if (ret < 0 || ret >= nr_stats)
goto endjob; goto endjob;
} else {
ret = 0;
}
if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", virReportError(VIR_ERR_OPERATION_FAILED, "%s",