提交 09ebc10f 编写于 作者: J Ján Tomko

Only call qemuMonitorGetMemoryStats for virtio memballoon

There is nothing to get from the monitor for model='none'.
上级 4bfc58b5
......@@ -11599,14 +11599,19 @@ qemuDomainMemoryStats(virDomainPtr dom,
goto endjob;
}
priv = vm->privateData;
qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorGetMemoryStats(priv->mon, stats, nr_stats);
if (qemuDomainObjExitMonitor(driver, vm) < 0)
ret = -1;
if (vm->def->memballoon &&
vm->def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) {
priv = vm->privateData;
qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorGetMemoryStats(priv->mon, stats, nr_stats);
if (qemuDomainObjExitMonitor(driver, vm) < 0)
ret = -1;
if (ret < 0 || ret >= nr_stats)
goto endjob;
if (ret < 0 || ret >= nr_stats)
goto endjob;
} else {
ret = 0;
}
if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册