External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 13:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Add better message for some invalid block I/O settings

Browse Source 
For example when both total_bytes_sec and total_bytes_sec_max are set,
but the former gets cleaned due to new call setting, let's say,
read_bytes_sec, we end up with this weird message for the command:

 $ virsh blkdeviotune fedora vda --read-bytes-sec 3000
 error: Unable to change block I/O throttle
 error: unsupported configuration: value 'total_bytes_sec_max' cannot be set if 'total_bytes_sec' is not set

So let's make it more descriptive.  This is how it looks after the change:

 $ virsh blkdeviotune fedora vda --read-bytes-sec 3000
 error: Unable to change block I/O throttle
 error: unsupported configuration: cannot reset 'total_bytes_sec' when 'total_bytes_sec_max' is set

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

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2017-01-24 14:52:33 +01:00
parent 862bea96d9
commit b425245520
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/qemu/qemu_driver.c
View File

@ -17480,23 +17480,39 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
qemuDomainSetBlockIoTuneDefaults(&info, &disk->blkdeviotune, qemuDomainSetBlockIoTuneDefaults(&info, &disk->blkdeviotune,
set_fields); set_fields);
#define CHECK_MAX(val) \ #define CHECK_MAX(val, _bool) \
do { \ do { \
if (info.val##_max && !info.val) { \ if (info.val##_max) { \
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ if (!info.val) { \
_("value '%s' cannot be set if " \ if (QEMU_BLOCK_IOTUNE_SET_##_bool) { \
"'%s' is not set"), \ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \
#val "_max", #val); \ _("cannot reset '%s' when " \
goto endjob; \ "'%s' is set"), \
#val, #val "_max"); \
} else { \
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \
_("value '%s' cannot be set if " \
"'%s' is not set"), \
#val "_max", #val); \
} \
goto endjob; \
} \
if (info.val##_max < info.val) { \
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \
_("value '%s' cannot be " \
"smaller than '%s'"), \
#val "_max", #val); \
goto endjob; \
} \
} \ } \
} while (false); } while (false)
CHECK_MAX(total_bytes_sec); CHECK_MAX(total_bytes_sec, BYTES);
CHECK_MAX(read_bytes_sec); CHECK_MAX(read_bytes_sec, BYTES);
CHECK_MAX(write_bytes_sec); CHECK_MAX(write_bytes_sec, BYTES);
CHECK_MAX(total_iops_sec); CHECK_MAX(total_iops_sec, IOPS);
CHECK_MAX(read_iops_sec); CHECK_MAX(read_iops_sec, IOPS);
CHECK_MAX(write_iops_sec); CHECK_MAX(write_iops_sec, IOPS);
#undef CHECK_MAX #undef CHECK_MAX