From: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Date: Wed, 25 Jun 2014 01:57:32 +0000 (+0800)
Subject: LXC: check whether we get MemSwap[Total|Usage]
X-Git-Tag: v1.2.6-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae38288b8ac9c15a82f3f0cd563987418ec59d50;p=thirdparty%2Flibvirt.git

LXC: check whether we get MemSwap[Total|Usage]

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
---

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 8dfdc60d46..39e30ad21e 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -288,8 +288,11 @@ int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo)
     if (virLXCCgroupGetMemUsage(cgroup, meminfo) < 0)
         goto cleanup;
 
-    virLXCCgroupGetMemSwapTotal(cgroup, meminfo);
-    virLXCCgroupGetMemSwapUsage(cgroup, meminfo);
+    if (virLXCCgroupGetMemSwapTotal(cgroup, meminfo) < 0)
+        goto cleanup;
+
+    if (virLXCCgroupGetMemSwapUsage(cgroup, meminfo) < 0)
+        goto cleanup;
 
     ret = 0;
  cleanup: