openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: when leaving iotune group update xml properly 

Currently when disk is removed from iotune group (by setting
all tunables to zero) group name is leaved in config. Let's fix
it.

Given iotune defaults are taken from the destination group setting
tunables to zero may require different set of zero settings in API
call. Let's prohibit removing from group while specifying different
group name then current for the sanity sake.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Nikolay Shirokovskiy 2020-01-08 09:49:31 +03:00 committed by Michal Privoznik
parent 57ac9f5eef
commit 93b66b3cbb
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qemu/qemu_driver.c
View File

@ -19159,6 +19159,28 @@ qemuDomainFindGroupBlockIoTune(virDomainDefPtr def,
}
static int
qemuDomainCheckBlockIoTuneReset(virDomainDiskDefPtr disk,
virDomainBlockIoTuneInfoPtr newiotune)
{
if (virDomainBlockIoTuneInfoHasAny(newiotune))
return 0;
if (newiotune->group_name &&
STRNEQ_NULLABLE(newiotune->group_name, disk->blkdeviotune.group_name)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("creating a new group/updating existing with all"
" tune parameters zero is not supported"));
return -1;
}
/* all zero means remove any throttling and remove from group for qemu */
VIR_FREE(newiotune->group_name);
return 0;
}
static int
qemuDomainSetBlockIoTune(virDomainPtr dom,
const char *path,
@ -19417,6 +19439,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
set_fields) < 0)
goto endjob;
if (qemuDomainCheckBlockIoTuneReset(disk, &info) < 0)
goto endjob;
#define CHECK_MAX(val, _bool) \
do { \
if (info.val##_max) { \
@ -19496,6 +19521,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
set_fields) < 0)
goto endjob;
if (qemuDomainCheckBlockIoTuneReset(conf_disk, &conf_info) < 0)
goto endjob;
if (virDomainDiskSetBlockIOTune(conf_disk, &conf_info) < 0)
goto endjob;