After the recent changes, this function is now always returning zero. Turn it to 'void' to relieve callers from checking it. Signed-off-by: Daniel Henrique Barboza <danielhb413@xxxxxxxxx> --- src/qemu/qemu_domain.c | 4 +--- src/qemu/qemu_domain.h | 4 ++-- src/qemu/qemu_hotplug.c | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dfbd8ec3b8..5312c08be7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8045,7 +8045,7 @@ qemuDomainAlignMemorySizes(virDomainDefPtr def) * inplace. Default rounding is now to 1 MiB (qemu requires rounding to page, * size so this should be safe). */ -int +void qemuDomainMemoryDeviceAlignSize(virDomainDefPtr def, virDomainMemoryDefPtr mem) { @@ -8054,8 +8054,6 @@ qemuDomainMemoryDeviceAlignSize(virDomainDefPtr def, mem->size = VIR_ROUND_UP(mem->size, qemuDomainGetMemorySizeAlignment(def)); } - - return 0; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index cbd56861da..46cd66171c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -761,8 +761,8 @@ bool qemuDomainHasBlockjob(virDomainObjPtr vm, bool copy_only) ATTRIBUTE_NONNULL(1); int qemuDomainAlignMemorySizes(virDomainDefPtr def); -int qemuDomainMemoryDeviceAlignSize(virDomainDefPtr def, - virDomainMemoryDefPtr mem); +void qemuDomainMemoryDeviceAlignSize(virDomainDefPtr def, + virDomainMemoryDefPtr mem); virDomainChrDefPtr qemuFindAgentConfig(virDomainDefPtr def); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 26912334d2..d4e2c2a86c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2367,8 +2367,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, int id; int ret = -1; - if (qemuDomainMemoryDeviceAlignSize(vm->def, mem) < 0) - goto cleanup; + qemuDomainMemoryDeviceAlignSize(vm->def, mem); if (qemuDomainDefValidateMemoryHotplug(vm->def, priv->qemuCaps, mem) < 0) goto cleanup; @@ -5611,8 +5610,7 @@ qemuDomainDetachPrepMemory(virDomainObjPtr vm, virDomainMemoryDefPtr mem; int idx; - if (qemuDomainMemoryDeviceAlignSize(vm->def, match) < 0) - return -1; + qemuDomainMemoryDeviceAlignSize(vm->def, match); if ((idx = virDomainMemoryFindByDef(vm->def, match)) < 0) { virReportError(VIR_ERR_DEVICE_MISSING, -- 2.26.2