]> xenbits.xensource.com Git - libvirt.git/commitdiff
Invert the condition in qemuDomainMemoryStats
authorJán Tomko <jtomko@redhat.com>
Wed, 3 Jun 2015 14:58:31 +0000 (16:58 +0200)
committerJán Tomko <jtomko@redhat.com>
Fri, 5 Jun 2015 14:06:01 +0000 (16:06 +0200)
It only makes sense if qemuMonitorGetMemoryStats is called,
but the following patch will make that call conditional.

src/qemu/qemu_driver.c

index 818862b0fe6c89b84615874fd0f155c5fa0248c5..50eebf91c582caff3966b137c926011d9c71e6b2 100644 (file)
@@ -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: