virsh: fix setting weight and device-weights at the same time

When setting both blkio weight and device-weights at the same time, the weight
is lost. Fix it.
This commit is contained in:
Hu Tao 2011-11-30 15:26:25 +08:00 committed by Eric Blake
parent 55ecc49bbc
commit 7e976db4ea

View File

@ -4788,14 +4788,14 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
if (!virStrcpy(temp->field, VIR_DOMAIN_BLKIO_WEIGHT,
sizeof(temp->field)))
goto cleanup;
}
if (device_weight) {
weight = 0;
} else if (device_weight) {
temp->value.s = vshStrdup(ctl, device_weight);
temp->type = VIR_TYPED_PARAM_STRING;
if (!virStrcpy(temp->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT,
sizeof(temp->field)))
goto cleanup;
device_weight = NULL;
}
}