From 0b18972630590e13fd963a02e39a1048194f39ab Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 7 Dec 2021 17:20:46 +0100 Subject: [PATCH] qemuDomainAssignMemorySlots: Refactor cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Automatically free the 'slotmap' bitmap and get rid of the cleanup section. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_domain_address.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index f4cddc6176..18fc34d049 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3086,8 +3086,7 @@ qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm, static int qemuDomainAssignMemorySlots(virDomainDef *def) { - virBitmap *slotmap = NULL; - int ret = -1; + g_autoptr(virBitmap) slotmap = NULL; size_t i; if (!virDomainDefHasMemoryHotplug(def)) @@ -3103,7 +3102,7 @@ qemuDomainAssignMemorySlots(virDomainDef *def) case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: if (qemuAssignMemoryDeviceSlot(def->mems[i], slotmap) < 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: @@ -3116,12 +3115,7 @@ qemuDomainAssignMemorySlots(virDomainDef *def) } } - ret = 0; - - cleanup: - virBitmapFree(slotmap); - return ret; - + return 0; }