External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: improve error message for invalid blkiotune settings

Browse Source 
Before:
  $ virsh blkiotune dummy --device-read-bytes-sec /dev/sda,-1
  error: Unable to change blkio parameters
  error: invalid argument: unable to parse blkio device
  'device_read_bytes_sec' '/dev/sda,-1'

After:
  $ virsh blkiotune dummy --device-read-bytes-sec /dev/sda,-1
  error: Unable to change blkio parameters
  error: invalid argument: invalid value '-1' for parameter
  'device_read_bytes_sec' of device '/dev/sda'

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1131306

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-10-29 16:36:39 +01:00
parent 0ed1b55b20
commit 278bf0acbf
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_driver.c
View File

@ -8084,7 +8084,7 @@ qemuDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
/* A valid string must have even number of fields, hence an odd /* A valid string must have even number of fields, hence an odd
* number of commas. */ * number of commas. */
if (!(nsep & 1)) if (!(nsep & 1))
goto error; goto parse_error;
ndevices = (nsep + 1) / 2; ndevices = (nsep + 1) / 2;
@ -8099,7 +8099,7 @@ qemuDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
/* device path */ /* device path */
p = strchr(p, ','); p = strchr(p, ',');
if (!p) if (!p)
goto error; goto parse_error;
if (VIR_STRNDUP(result[i].path, temp, p - temp) < 0) if (VIR_STRNDUP(result[i].path, temp, p - temp) < 0)
goto cleanup; goto cleanup;
@ -8109,21 +8109,23 @@ qemuDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) {
if (virStrToLong_uip(temp, &p, 10, &result[i].weight) < 0) if (virStrToLong_uip(temp, &p, 10, &result[i].weight) < 0)
goto error; goto number_error;
} else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS)) { } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS)) {
if (virStrToLong_uip(temp, &p, 10, &result[i].riops) < 0) if (virStrToLong_uip(temp, &p, 10, &result[i].riops) < 0)
goto error; goto number_error;
} else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS)) { } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_IOPS)) {
if (virStrToLong_uip(temp, &p, 10, &result[i].wiops) < 0) if (virStrToLong_uip(temp, &p, 10, &result[i].wiops) < 0)
goto error; goto number_error;
} else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) { } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) {
if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0) if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0)
goto error; goto number_error;
} else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) { } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) {
if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0) if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0)
goto error; goto number_error;
} else { } else {
goto error; virReportError(VIR_ERR_INVALID_ARG,
_("unknown parameter '%s'"), type);
goto cleanup;
} }
i++; i++;
@ -8131,7 +8133,7 @@ qemuDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
if (*p == '\0') if (*p == '\0')
break; break;
else if (*p != ',') else if (*p != ',')
goto error; goto parse_error;
temp = p + 1; temp = p + 1;
} }
@ -8143,10 +8145,17 @@ qemuDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
return 0; return 0;
error: parse_error:
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("unable to parse blkio device '%s' '%s'"), _("unable to parse blkio device '%s' '%s'"),
type, blkioDeviceStr); type, blkioDeviceStr);
goto cleanup;
number_error:
virReportError(VIR_ERR_INVALID_ARG,
_("invalid value '%s' for parameter '%s' of device '%s'"),
temp, type, result[i].path);
cleanup: cleanup:
if (result) { if (result) {
virBlkioDeviceArrayClear(result, ndevices); virBlkioDeviceArrayClear(result, ndevices);