From nobody Sat Feb 7 08:55:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1612413609; cv=none; d=zohomail.com; s=zohoarc; b=OGcjd8mDs/EYFu6PoflmCkB5Sf//guMq+6c4QnW/tr2XrTGcpY3is86dV7SplZBSvPQn3FSJ+vz1ZEWmDIpRtJjyGPl1vn/iQaUntaB9s09vQGQvPlcNZnwE9vllVuN0FqKEGlwrY3mNihzyg7puCokFBPXv0sQXPGBTUGThrCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612413609; 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=e1F3mEgZemdxQgk2+z17AXWlV9gBJxM0RdivZ4zVJy8=; b=mzlfCrn80+BBFLIAhmHNRbbfMOZ5KXeaUlmc4IA4uyVIQCfWdq/YS1Mh8tmUTG7YtheFI2mWuPNgruyciC/xtv7qWUMvGcvHaa5Mx2F7gbI7hnxxYXOeBzgfM+St0ycFcWXG21xWg6EWq7yLdOimNxACk5gSUdeWmq8sgT/TQMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 161241360996243.71072813313424; Wed, 3 Feb 2021 20:40:09 -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-9-uaXeucTWPcK2xwE0oEwdPg-1; Wed, 03 Feb 2021 23:39:08 -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 C2DEB8030BF; Thu, 4 Feb 2021 04:39:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FE6960C71; Thu, 4 Feb 2021 04:39:01 +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 6C7E518089D2; Thu, 4 Feb 2021 04:39:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1144cfhK011342 for ; Wed, 3 Feb 2021 23:38:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id A0B2B100AE4D; Thu, 4 Feb 2021 04:38:41 +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 6B66F100763D for ; Thu, 4 Feb 2021 04:38:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612413608; 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=e1F3mEgZemdxQgk2+z17AXWlV9gBJxM0RdivZ4zVJy8=; b=DeQ2CZc++kbhg/03znULzPs3aTPsk5iteo303S4ZPAa4AjL/GWFsuxnm8S95F0eJP+NZ5h HfYiaTna7UK95570kVbhcFpnfyQ25PRBnPQr9qGjS/NgeDb3tF0ekMDH30HiwwUrnCcI/j LWUPaHkjYtsyEpwkip6CB8/iOLR/ssE= X-MC-Unique: uaXeucTWPcK2xwE0oEwdPg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 10/15] rpc: replace VIR_FREE with g_free in all *Dispose() functions Date: Wed, 3 Feb 2021 23:38:29 -0500 Message-Id: <20210204043834.191994-11-laine@redhat.com> In-Reply-To: <20210204043834.191994-1-laine@redhat.com> References: <20210204043834.191994-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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/rpc/virnetclient.c | 4 ++-- src/rpc/virnetdaemon.c | 6 +++--- src/rpc/virnetlibsshsession.c | 18 +++++++++--------- src/rpc/virnetsaslcontext.c | 2 +- src/rpc/virnetserver.c | 8 ++++---- src/rpc/virnetserverservice.c | 2 +- src/rpc/virnetsocket.c | 6 +++--- src/rpc/virnetsshsession.c | 8 ++++---- src/rpc/virnettlscontext.c | 6 +++--- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 2eabacd6e8..edd65941ac 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -747,12 +747,12 @@ void virNetClientDispose(void *obj) =20 for (i =3D 0; i < client->nprograms; i++) virObjectUnref(client->programs[i]); - VIR_FREE(client->programs); + g_free(client->programs); =20 g_main_loop_unref(client->eventLoop); g_main_context_unref(client->eventCtx); =20 - VIR_FREE(client->hostname); + g_free(client->hostname); =20 if (client->sock) virNetSocketRemoveIOCallback(client->sock); diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index e337ff1fde..2c18da790b 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -99,9 +99,9 @@ virNetDaemonDispose(void *obj) =20 for (i =3D 0; i < dmn->nsignals; i++) { sigaction(dmn->signals[i]->signum, &dmn->signals[i]->oldaction, NU= LL); - VIR_FREE(dmn->signals[i]); + g_free(dmn->signals[i]); } - VIR_FREE(dmn->signals); + g_free(dmn->signals); VIR_FORCE_CLOSE(dmn->sigread); VIR_FORCE_CLOSE(dmn->sigwrite); if (dmn->sigwatch > 0) @@ -109,7 +109,7 @@ virNetDaemonDispose(void *obj) #endif /* !WIN32 */ =20 VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd); - VIR_FREE(dmn->stateStopThread); + g_free(dmn->stateStopThread); =20 virHashFree(dmn->servers); =20 diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 48ef914c70..8814487557 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -132,18 +132,18 @@ virNetLibsshSessionDispose(void *obj) =20 for (i =3D 0; i < sess->nauths; i++) { virSecureEraseString(sess->auths[i]->password); - VIR_FREE(sess->auths[i]->password); - VIR_FREE(sess->auths[i]->filename); - VIR_FREE(sess->auths[i]); + g_free(sess->auths[i]->password); + g_free(sess->auths[i]->filename); + g_free(sess->auths[i]); } =20 - VIR_FREE(sess->auths); + g_free(sess->auths); =20 - VIR_FREE(sess->channelCommand); - VIR_FREE(sess->hostname); - VIR_FREE(sess->knownHostsFile); - VIR_FREE(sess->authPath); - VIR_FREE(sess->username); + g_free(sess->channelCommand); + g_free(sess->hostname); + g_free(sess->knownHostsFile); + g_free(sess->authPath); + g_free(sess->username); } =20 static virClassPtr virNetLibsshSessionClass; diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index 9253771787..8a6250120d 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -699,7 +699,7 @@ void virNetSASLSessionDispose(void *obj) =20 if (sasl->conn) sasl_dispose(&sasl->conn); - VIR_FREE(sasl->callbacks); + g_free(sasl->callbacks); } =20 #ifdef __APPLE__ diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index fa63acbb09..f0b866a962 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -909,21 +909,21 @@ void virNetServerDispose(void *obj) virNetServerPtr srv =3D obj; size_t i; =20 - VIR_FREE(srv->name); + g_free(srv->name); =20 virThreadPoolFree(srv->workers); =20 for (i =3D 0; i < srv->nservices; i++) virObjectUnref(srv->services[i]); - VIR_FREE(srv->services); + g_free(srv->services); =20 for (i =3D 0; i < srv->nprograms; i++) virObjectUnref(srv->programs[i]); - VIR_FREE(srv->programs); + g_free(srv->programs); =20 for (i =3D 0; i < srv->nclients; i++) virObjectUnref(srv->clients[i]); - VIR_FREE(srv->clients); + g_free(srv->clients); } =20 void virNetServerClose(virNetServerPtr srv) diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 317cacf25b..73232e3747 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -419,7 +419,7 @@ void virNetServerServiceDispose(void *obj) =20 for (i =3D 0; i < svc->nsocks; i++) virObjectUnref(svc->socks[i]); - VIR_FREE(svc->socks); + g_free(svc->socks); =20 virObjectUnref(svc->tls); } diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e56d43ba85..d0dc59c10c 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1356,9 +1356,9 @@ void virNetSocketDispose(void *obj) =20 virProcessAbort(sock->pid); =20 - VIR_FREE(sock->localAddrStrSASL); - VIR_FREE(sock->remoteAddrStrSASL); - VIR_FREE(sock->remoteAddrStrURI); + g_free(sock->localAddrStrSASL); + g_free(sock->remoteAddrStrSASL); + g_free(sock->remoteAddrStrURI); } =20 =20 diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 5bfe311544..f42aed3f62 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -151,10 +151,10 @@ virNetSSHSessionDispose(void *obj) =20 virNetSSHSessionAuthMethodsClear(sess); =20 - VIR_FREE(sess->channelCommand); - VIR_FREE(sess->hostname); - VIR_FREE(sess->knownHostsFile); - VIR_FREE(sess->authPath); + g_free(sess->channelCommand); + g_free(sess->hostname); + g_free(sess->knownHostsFile); + g_free(sess->authPath); } =20 static virClassPtr virNetSSHSessionClass; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 84f7e63e4d..2936b8ba57 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1146,7 +1146,7 @@ void virNetTLSContextDispose(void *obj) PROBE(RPC_TLS_CONTEXT_DISPOSE, "ctxt=3D%p", ctxt); =20 - VIR_FREE(ctxt->priority); + g_free(ctxt->priority); gnutls_dh_params_deinit(ctxt->dhParams); gnutls_certificate_free_credentials(ctxt->x509cred); } @@ -1415,8 +1415,8 @@ void virNetTLSSessionDispose(void *obj) PROBE(RPC_TLS_SESSION_DISPOSE, "sess=3D%p", sess); =20 - VIR_FREE(sess->x509dname); - VIR_FREE(sess->hostname); + g_free(sess->x509dname); + g_free(sess->hostname); gnutls_deinit(sess->session); } =20 --=20 2.29.2