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

qemu: fix using defaults when setting persistent iotune params

Browse Source 
virDomainSetBlockIoTune not simply sets the iotune params given in API
but use current settings for all the omitted params. Unfortunately
it uses current settings for active config when setting inactive
params. Let's fix it.

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:28 +03:00 committed by Michal Privoznik
parent dd94f36ffb
commit bb36ae81a0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_driver.c
View File

@ -19150,6 +19150,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
virDomainDefPtr def = NULL;
virDomainDefPtr persistentDef = NULL;
virDomainBlockIoTuneInfo info;
virDomainBlockIoTuneInfo conf_info;
g_autofree char *drivealias = NULL;
const char *qdevid = NULL;
int ret = -1;
@ -19213,6 +19214,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
return -1;
memset(&info, 0, sizeof(info));
memset(&conf_info, 0, sizeof(conf_info));
if (!(vm = qemuDomainObjFromDomain(dom)))
return -1;
@ -19337,6 +19339,8 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
goto endjob;
}
virDomainBlockIoTuneInfoCopy(&info, &conf_info);
if (def) {
supportMaxOptions = virQEMUCapsGet(priv->qemuCaps,
QEMU_CAPS_DRIVE_IOTUNE_MAX);
@ -19459,13 +19463,15 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
goto endjob;
}
if (qemuDomainSetBlockIoTuneDefaults(&info, &conf_disk->blkdeviotune,
if (qemuDomainSetBlockIoTuneDefaults(&conf_info, &conf_disk->blkdeviotune,
set_fields) < 0)
goto endjob;
if (virDomainDiskSetBlockIOTune(conf_disk, &info) < 0)
if (virDomainDiskSetBlockIOTune(conf_disk, &conf_info) < 0)
goto endjob;
qemuDomainSetGroupBlockIoTune(persistentDef, &conf_info);
if (virDomainDefSave(persistentDef, driver->xmlopt,
cfg->configDir) < 0)
goto endjob;
@ -19477,6 +19483,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
cleanup:
VIR_FREE(info.group_name);
VIR_FREE(conf_info.group_name);
virDomainObjEndAPI(&vm);
if (eventNparams)
virTypedParamsFree(eventParams, eventNparams);