From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Wed, 20 Oct 2010 12:16:28 +0000 (+0200)
Subject: virsh: Don't read nparams when virDomainGetMemoryParameters fails
X-Git-Tag: v0.8.5~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=076cf3a0bd5881aa444d995013efb388b21c1523;p=thirdparty%2Flibvirt.git

virsh: Don't read nparams when virDomainGetMemoryParameters fails

Also exit early when nparams is 0.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index d1ef6981ca..3e37b06329 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -2941,17 +2941,22 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
 
     if (nparams == 0) {
         /* get the number of memory parameters */
-        if ((virDomainGetMemoryParameters(dom, NULL, &nparams, 0) != 0) &&
-            (nparams != 0)) {
+        if (virDomainGetMemoryParameters(dom, NULL, &nparams, 0) != 0) {
             vshError(ctl, "%s",
                      _("Unable to get number of memory parameters"));
             goto cleanup;
         }
 
+        if (nparams == 0) {
+            /* nothing to output */
+            ret = TRUE;
+            goto cleanup;
+        }
+
         /* now go get all the memory parameters */
         params = vshMalloc(ctl, sizeof(virMemoryParameter) * nparams);
         memset(params, 0, sizeof(virMemoryParameter) * nparams);
-        if (virDomainGetMemoryParameters(dom, params, &nparams, 0)) {
+        if (virDomainGetMemoryParameters(dom, params, &nparams, 0) != 0) {
             vshError(ctl, "%s", _("Unable to get memory parameters"));
             goto cleanup;
         }
@@ -3026,7 +3031,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
             }
         }
         if (virDomainSetMemoryParameters(dom, params, nparams, 0) != 0)
-            vshError(ctl, "%s", _("Unable to change Memory Parameters"));
+            vshError(ctl, "%s", _("Unable to change memory parameters"));
         else
             ret = TRUE;
     }