From nobody Fri May 3 06:18:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667553724; cv=none; d=zohomail.com; s=zohoarc; b=UAw3eO3kyfjetZnFQvcKeHvuSM8tnxqKpEMrJb/BOJT5cQhzSo5XkruitZppHSVnZdh+vsCaap7LOjSuq670MDNWqdVlxzXY0P+U+sOkJSRJxI4KY4KaB5EVvQPbe9keFs5OB4gXaMMPmkupZw2YgOjVMErQk9g/B4GRNgMcMio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667553724; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=EKaJHQmjnRYaTphKgqMJxeY2zpFIBc0hD/AIXV5n9ek=; b=L3OVdaT2fHteUx3NUChjCyPVVl4C2eZ4WMuolai+nhzLxPJMmi0HvsIemikTbK4aezRfKcaOHRxH7szmTpdFFtIJE+Su/jyRjAgiFCZwZnE+3lzyi2b/501ubqHwSVZhd793o6dX//PSePXMiZ0N3n8mUXyaNINiQKPsxAlh7Pw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1667553724726257.8654405060947; Fri, 4 Nov 2022 02:22:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-246-eSsd2wyOPSOY96PUZpTIvw-1; Fri, 04 Nov 2022 05:21:58 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B52E2811E67; Fri, 4 Nov 2022 09:21:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A22251121319; Fri, 4 Nov 2022 09:21:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7272E1946587; Fri, 4 Nov 2022 09:21:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 231131946586 for ; Fri, 4 Nov 2022 09:21:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0978F2166B48; Fri, 4 Nov 2022 09:21:55 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A24EA2166B26 for ; Fri, 4 Nov 2022 09:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667553722; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EKaJHQmjnRYaTphKgqMJxeY2zpFIBc0hD/AIXV5n9ek=; b=dO+sO1cpiDjbHWwAPtavweF+kixo6rW2AH8xLzsDzX/zMJyLH8n1oVnzldl9+KSxaCKvzO JNTvFZimSsRwmPpZgRtVTOSEXluXDcNxBvnkBwNsAVYJerZHGBGKYFFgm74f/O5moXEFgI HurxiAZa+9FLDP4Y7PqTBKTImANCtH8= X-MC-Unique: eSsd2wyOPSOY96PUZpTIvw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] qemu: Drop NULL checks guarding g_slist_free_full() Date: Fri, 4 Nov 2022 10:21:53 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667553725600100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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=C3=A1n 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; =20 qemuMigrationParamsFree(priv->migParams); - if (priv->migTempBitmaps) - g_slist_free_full(priv->migTempBitmaps, - (GDestroyNotify) qemuDomainJobPrivateMigrateTemp= BitmapFree); + g_slist_free_full(priv->migTempBitmaps, + (GDestroyNotify) qemuDomainJobPrivateMigrateTempBitm= apFree); g_free(priv); } =20 @@ -1733,8 +1732,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *p= riv) =20 priv->dbusDaemonRunning =3D false; =20 - 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); =20 priv->dbusVMState =3D false; =20 diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 95e803b3e1..4d070e438d 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -139,9 +139,8 @@ qemuMigrationBlockDirtyBitmapsDiskFree(qemuMigrationBlo= ckDirtyBitmapsDisk *dsk) return; =20 g_free(dsk->target); - if (dsk->bitmaps) - g_slist_free_full(dsk->bitmaps, - (GDestroyNotify) qemuMigrationBlockDirtyBitmapsD= iskBitmapFree); + g_slist_free_full(dsk->bitmaps, + (GDestroyNotify) qemuMigrationBlockDirtyBitmapsDiskB= itmapFree); g_free(dsk); } =20 @@ -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) qemuMigrationBlockDirtyBitmapsD= iskFree); + g_slist_free_full(mig->blockDirtyBitmaps, + (GDestroyNotify) qemuMigrationBlockDirtyBitmapsDiskF= ree); g_free(mig); } =20 --=20 2.37.4