]> xenbits.xensource.com Git - libvirt.git/commitdiff
virsh: Actually make blkdeviotune --group_name work
authorMartin Kletzander <mkletzan@redhat.com>
Wed, 25 Jan 2017 08:35:47 +0000 (09:35 +0100)
committerMartin Kletzander <mkletzan@redhat.com>
Sun, 29 Jan 2017 18:57:12 +0000 (19:57 +0100)
Function vshCommandOptStringReq() returns -1 on error and 0 on
success.  The code, however, used the 'group_name' variable only if it
returned 1 (never).

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
tools/virsh-domain.c

index 93587e8bc7c79cbb66b6ee107472dfec5f320dab..4360306989d873229c69e98dbb3d1c0436f45fc5 100644 (file)
@@ -1398,11 +1398,12 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd)
     VSH_ADD_IOTUNE(write-iops-sec-max-length, WRITE_IOPS_SEC_MAX_LENGTH);
 #undef VSH_ADD_IOTUNE
 
-    rv = vshCommandOptStringReq(ctl, cmd, "group_name", &group_name);
-    if (rv < 0) {
+    if (vshCommandOptStringReq(ctl, cmd, "group_name", &group_name) < 0) {
         vshError(ctl, "%s", _("Unable to parse group parameter"));
         goto cleanup;
-    } else if (rv > 0) {
+    }
+
+    if (group_name) {
         if (virTypedParamsAddString(&params, &nparams, &maxparams,
                                     VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME,
                                     group_name) < 0)