提交 4bfc58b5 编写于 作者: J Ján Tomko

Invert the condition in qemuDomainMemoryStats

It only makes sense if qemuMonitorGetMemoryStats is called,
but the following patch will make that call conditional.
上级 4bcdd9cc
......@@ -11580,6 +11580,7 @@ qemuDomainMemoryStats(virDomainPtr dom,
qemuDomainObjPrivatePtr priv;
virDomainObjPtr vm;
int ret = -1;
long rss;
virCheckFlags(0, -1);
......@@ -11604,17 +11605,16 @@ qemuDomainMemoryStats(virDomainPtr dom,
if (qemuDomainObjExitMonitor(driver, vm) < 0)
ret = -1;
if (ret >= 0 && ret < nr_stats) {
long rss;
if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("cannot get RSS for domain"));
} else {
stats[ret].tag = VIR_DOMAIN_MEMORY_STAT_RSS;
stats[ret].val = rss;
ret++;
}
if (ret < 0 || ret >= nr_stats)
goto endjob;
if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("cannot get RSS for domain"));
} else {
stats[ret].tag = VIR_DOMAIN_MEMORY_STAT_RSS;
stats[ret].val = rss;
ret++;
}
endjob:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册