From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 3 Jun 2015 14:58:31 +0000 (+0200)
Subject: Invert the condition in qemuDomainMemoryStats
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4bfc58b58daf03ebb06dab837a303b90b0535c2e;p=libvirt.git

Invert the condition in qemuDomainMemoryStats

It only makes sense if qemuMonitorGetMemoryStats is called,
but the following patch will make that call conditional.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 818862b0fe..50eebf91c5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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: