From eebef24d96dc26214bbd264be2eaddff7dafb2b6 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 4 Nov 2022 10:11:46 +0100 Subject: [PATCH] qemu: Drop NULL checks guarding g_slist_free_full() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The g_slist_free_full() function is perfectly capable of handling NULL (in which case it's NOP), therefore there's no need to check passed pointers for NULL. We have them though in couple of places. Drop them. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- src/qemu/qemu_domain.c | 8 +++----- src/qemu/qemu_migration_cookie.c | 10 ++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c3afc6c9d3..09e213e48d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -103,9 +103,8 @@ qemuJobFreePrivate(void *opaque) return; qemuMigrationParamsFree(priv->migParams); - if (priv->migTempBitmaps) - g_slist_free_full(priv->migTempBitmaps, - (GDestroyNotify) qemuDomainJobPrivateMigrateTempBitmapFree); + g_slist_free_full(priv->migTempBitmaps, + (GDestroyNotify) qemuDomainJobPrivateMigrateTempBitmapFree); g_free(priv); } @@ -1733,8 +1732,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *priv) priv->dbusDaemonRunning = false; - if (priv->dbusVMStateIds) - g_slist_free_full(g_steal_pointer(&priv->dbusVMStateIds), g_free); + g_slist_free_full(g_steal_pointer(&priv->dbusVMStateIds), g_free); priv->dbusVMState = false; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 95e803b3e1..4d070e438d 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -139,9 +139,8 @@ qemuMigrationBlockDirtyBitmapsDiskFree(qemuMigrationBlockDirtyBitmapsDisk *dsk) return; g_free(dsk->target); - if (dsk->bitmaps) - g_slist_free_full(dsk->bitmaps, - (GDestroyNotify) qemuMigrationBlockDirtyBitmapsDiskBitmapFree); + g_slist_free_full(dsk->bitmaps, + (GDestroyNotify) qemuMigrationBlockDirtyBitmapsDiskBitmapFree); g_free(dsk); } @@ -168,9 +167,8 @@ qemuMigrationCookieFree(qemuMigrationCookie *mig) g_clear_pointer(&mig->jobData, virDomainJobDataFree); virCPUDefFree(mig->cpu); qemuMigrationCookieCapsFree(mig->caps); - if (mig->blockDirtyBitmaps) - g_slist_free_full(mig->blockDirtyBitmaps, - (GDestroyNotify) qemuMigrationBlockDirtyBitmapsDiskFree); + g_slist_free_full(mig->blockDirtyBitmaps, + (GDestroyNotify) qemuMigrationBlockDirtyBitmapsDiskFree); g_free(mig); } -- 2.47.2