NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: make virDomainDiskSetBlockIOTune() void

Browse Source 
This function always returns zero, so it might as well be void.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Matt Coleman 2020-11-05 22:32:54 -05:00 committed by Michal Privoznik
parent 82966a0104
commit 8f80014299
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -31963,10 +31963,8 @@ virDomainDefVcpuOrderClear(virDomainDefPtr def)
* *
* Set the block I/O tune settings from @info on the @disk, but error out early * Set the block I/O tune settings from @info on the @disk, but error out early
* in case of any error. That is to make sure nothing will fail half-way. * in case of any error. That is to make sure nothing will fail half-way.
*
* Returns: 0 on success, -1 otherwise
*/ */
int void
virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk, virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk,
virDomainBlockIoTuneInfo *info) virDomainBlockIoTuneInfo *info)
{ {
@ -31977,8 +31975,6 @@ virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk,
VIR_FREE(disk->blkdeviotune.group_name); VIR_FREE(disk->blkdeviotune.group_name);
disk->blkdeviotune = *info; disk->blkdeviotune = *info;
disk->blkdeviotune.group_name = g_steal_pointer(&tmp_group); disk->blkdeviotune.group_name = g_steal_pointer(&tmp_group);
return 0;
} }

4
src/conf/domain_conf.h
View File

@ -3804,8 +3804,8 @@ virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def,
int *nparams, int *nparams,
int maxparams); int maxparams);
int virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk, void virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk,
virDomainBlockIoTuneInfo *info); virDomainBlockIoTuneInfo *info);
bool bool
virDomainNetTypeSharesHostView(const virDomainNetDef *net); virDomainNetTypeSharesHostView(const virDomainNetDef *net);

6
src/qemu/qemu_driver.c
View File

@ -16324,8 +16324,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
goto endjob; goto endjob;
ret = -1; ret = -1;
if (virDomainDiskSetBlockIOTune(disk, &info) < 0) virDomainDiskSetBlockIOTune(disk, &info);
goto endjob;
qemuDomainSetGroupBlockIoTune(def, &info); qemuDomainSetGroupBlockIoTune(def, &info);
@ -16356,8 +16355,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
if (qemuDomainCheckBlockIoTuneReset(conf_disk, &conf_info) < 0) if (qemuDomainCheckBlockIoTuneReset(conf_disk, &conf_info) < 0)
goto endjob; goto endjob;
if (virDomainDiskSetBlockIOTune(conf_disk, &conf_info) < 0) virDomainDiskSetBlockIOTune(conf_disk, &conf_info);
goto endjob;
qemuDomainSetGroupBlockIoTune(persistentDef, &conf_info); qemuDomainSetGroupBlockIoTune(persistentDef, &conf_info);

3
src/test/test_driver.c
View File

@ -3832,8 +3832,7 @@ testDomainSetBlockIoTune(virDomainPtr dom,
#undef TEST_BLOCK_IOTUNE_MAX_CHECK #undef TEST_BLOCK_IOTUNE_MAX_CHECK
if (virDomainDiskSetBlockIOTune(conf_disk, &info) < 0) virDomainDiskSetBlockIOTune(conf_disk, &info);
goto cleanup;
info.group_name = NULL; info.group_name = NULL;
ret = 0; ret = 0;