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

Add endjob label to qemuDomainMemoryStats

Reduce the indentation level.
上级 c09e1729
...@@ -11577,6 +11577,7 @@ qemuDomainMemoryStats(virDomainPtr dom, ...@@ -11577,6 +11577,7 @@ qemuDomainMemoryStats(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
qemuDomainObjPrivatePtr priv;
virDomainObjPtr vm; virDomainObjPtr vm;
int ret = -1; int ret = -1;
...@@ -11594,27 +11595,29 @@ qemuDomainMemoryStats(virDomainPtr dom, ...@@ -11594,27 +11595,29 @@ qemuDomainMemoryStats(virDomainPtr dom,
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running")); "%s", _("domain is not running"));
} else { goto endjob;
qemuDomainObjPrivatePtr 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) { priv = vm->privateData;
long rss; qemuDomainObjEnterMonitor(driver, vm);
if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { ret = qemuMonitorGetMemoryStats(priv->mon, stats, nr_stats);
virReportError(VIR_ERR_OPERATION_FAILED, "%s", if (qemuDomainObjExitMonitor(driver, vm) < 0)
_("cannot get RSS for domain")); ret = -1;
} else {
stats[ret].tag = VIR_DOMAIN_MEMORY_STAT_RSS;
stats[ret].val = rss;
ret++;
}
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++;
} }
} }
endjob:
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
cleanup: cleanup:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册