From nobody Tue Feb 10 12:45:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1612411151; cv=none; d=zohomail.com; s=zohoarc; b=AxGa0+vVKKMbdktMklBaJ7xL4QyrnOovPguUWljlW6pJ2fICf7BLxtmaixIuVnJotOSrIvnc/tZYeVwe8tujRHmo8sW8JajrKQ/FxbxxJmgVGiI4WgMkc81rIZ/Ccv5KnjCVYe70lXf+TP/CYiXeVuIUs72kPkV9iBwcQEce/lE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612411151; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3vRHs5S4n0FLsJvKKD2rQ3Fzk+XEvII8lygmdNlyKk0=; b=KS+SE2XPS4mjdMo5TzsUVdKiqZEL39pgKAgS0VZUUvBiX+b5AcsxBuR7AUQDDhNuc8JV6UqghvPip3ff8MmgCfxr4ng/rqI9s/Bo74GOpZDh61SOCeMDxqbcDEKrwPKj97AuW+WuiXrIeFWT/4mcmg4r0JFWE7+91Lar0B5iPwY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612411151063468.76216563332594; Wed, 3 Feb 2021 19:59:11 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196-i9VmnfJtN86qtfmgNb0dBQ-1; Wed, 03 Feb 2021 22:58:20 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 028D58030BF; Thu, 4 Feb 2021 03:58:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D680D60C6C; Thu, 4 Feb 2021 03:58:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9FD8C58075; Thu, 4 Feb 2021 03:58:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1143w48D003403 for ; Wed, 3 Feb 2021 22:58:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id CF4185B698; Thu, 4 Feb 2021 03:58:04 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-199.phx2.redhat.com [10.3.112.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AC085B697 for ; Thu, 4 Feb 2021 03:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612411150; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3vRHs5S4n0FLsJvKKD2rQ3Fzk+XEvII8lygmdNlyKk0=; b=Sd7l4504WcSDiwewo66a7tjn70jCrXk5xWBlne+mW6zJZRr+CwMzVGcp5JMVHFukWOZiHm 9KNyIeKtP2rO3THPwz8oX6FBxdYp4hB47jt7kX/zOIBaKA7zF2iayU5RzEkGEKk3qVf3R8 ddNmNcfZnlc/bDxECwGZE9tWErQ1z6A= X-MC-Unique: i9VmnfJtN86qtfmgNb0dBQ-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH v2 11/24] locking: replace VIR_FREE with g_free in all vir*Free() functions Date: Wed, 3 Feb 2021 22:57:38 -0500 Message-Id: <20210204035751.164765-12-laine@redhat.com> In-Reply-To: <20210204035751.164765-1-laine@redhat.com> References: <20210204035751.164765-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Laine Stump --- src/locking/lock_daemon.c | 6 +++--- src/locking/lock_daemon_config.c | 6 +++--- src/locking/lock_driver_lockd.c | 10 +++++----- src/locking/lock_driver_sanlock.c | 6 +++--- src/locking/lock_manager.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 851e9fc6f0..94fe374df6 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -92,7 +92,7 @@ virLockDaemonFree(virLockDaemonPtr lockd) virHashFree(lockd->lockspaces); virLockSpaceFree(lockd->defaultLockspace); =20 - VIR_FREE(lockd); + g_free(lockd); } =20 static inline void @@ -435,8 +435,8 @@ virLockDaemonClientFree(void *opaque) } =20 g_mutex_clear(&priv->lock); - VIR_FREE(priv->ownerName); - VIR_FREE(priv); + g_free(priv->ownerName); + g_free(priv); } =20 =20 diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_con= fig.c index 6346703715..f693911997 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -71,10 +71,10 @@ virLockDaemonConfigFree(virLockDaemonConfigPtr data) if (!data) return; =20 - VIR_FREE(data->log_filters); - VIR_FREE(data->log_outputs); + g_free(data->log_filters); + g_free(data->log_outputs); =20 - VIR_FREE(data); + g_free(data); } =20 static int diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 5ebefa48d0..a1deb55788 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -369,13 +369,13 @@ virLockManagerLockDaemonPrivateFree(virLockManagerLoc= kDaemonPrivatePtr priv) return; =20 for (i =3D 0; i < priv->nresources; i++) { - VIR_FREE(priv->resources[i].lockspace); - VIR_FREE(priv->resources[i].name); + g_free(priv->resources[i].lockspace); + g_free(priv->resources[i].name); } - VIR_FREE(priv->resources); + g_free(priv->resources); =20 - VIR_FREE(priv->name); - VIR_FREE(priv); + g_free(priv->name); + g_free(priv); } =20 static void virLockManagerLockDaemonFree(virLockManagerPtr lock) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 7319f56819..aaffe30e6f 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -513,10 +513,10 @@ static void virLockManagerSanlockFree(virLockManagerP= tr lock) if (!priv) return; =20 - VIR_FREE(priv->vm_name); + g_free(priv->vm_name); for (i =3D 0; i < priv->res_count; i++) - VIR_FREE(priv->res_args[i]); - VIR_FREE(priv); + g_free(priv->res_args[i]); + g_free(priv); lock->privateData =3D NULL; } =20 diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index d83a192bf6..db724eb30f 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -387,7 +387,7 @@ int virLockManagerFree(virLockManagerPtr lock) =20 lock->driver->drvFree(lock); =20 - VIR_FREE(lock); + g_free(lock); =20 return 0; } --=20 2.29.2