From nobody Fri May 3 07:42:56 2024 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=1613107734; cv=none; d=zohomail.com; s=zohoarc; b=NUJFxuKvfN/S7HmfHXihyPhtiJ6u28hcXEi4B7mMTPcPHBEqOCLBXSFvZ2+HEoXWc3erGj0/UTeMFBIo2NjeOw4p6pJxcMQ9SLJoHspNoKXkxphADHI1upJyjp/qj9bJ1ZQWXmTu8gouK7X+V3J1xF+3XGdGfh8g4IP+kAH1gi8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107734; 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=0u7EP2Zydj7Dvna0277Mixo6YtUN8Vlk/WICNZ9bT3o=; b=dadt4I6oLiIqKX/WYXlESi6S0yoHDvXDcFwXA0SDpeE7cl0trafTeXdm+QtFx+3EtrGI+icHkeNRSS7QiCiBErEufJqoplyeYjm/mNNogeBgJ4/kUqQ8BKdh3twIJnrDZS0vKnJzXHnuUT6a1M1feN6MdJ5EPveo0w4AkTJmSz4= 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 1613107734345341.8579706698538; Thu, 11 Feb 2021 21:28:54 -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-284-MTmNfC6gOvWkiTB3nQvhhg-1; Fri, 12 Feb 2021 00:28:51 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E773D8030D7; Fri, 12 Feb 2021 05:28:45 +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 B9DCD6F7ED; Fri, 12 Feb 2021 05:28:45 +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 80A6918095CD; Fri, 12 Feb 2021 05:28:45 +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 11C5SOEq017127 for ; Fri, 12 Feb 2021 00:28:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 60E6710016F6; Fri, 12 Feb 2021 05:28:24 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28FE210013D7 for ; Fri, 12 Feb 2021 05:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107733; 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=0u7EP2Zydj7Dvna0277Mixo6YtUN8Vlk/WICNZ9bT3o=; b=NucGt6ttJVZz4uI9pca41MXBn5NTV2budsmiSeVGIb5xmTKykUZlbIzlSAg10NPtGxfFJ9 Nz7E9dIkWar/7USf0f0WI2dwJEgMHPEiFEHf2KfK3JUfO2cCCuiwmJvIZwmvQTtUjePx8g K2Y1u9VUqUth1A0u2QjpOVaKS7HcJ9g= X-MC-Unique: MTmNfC6gOvWkiTB3nQvhhg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 1/8] esx: replace VIR_FREE with g_free in any ESX_VI__TEMPLATE__FREE Date: Fri, 12 Feb 2021 00:28:11 -0500 Message-Id: <20210212052818.684878-2-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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.11 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" Invocations of the macro ESX_VI__TEMPLATE__FREE() will free the main object (referenced as "item") that's pointing to all the things being VIR_FREEd in the body, so it is safe for all the pointers in item to just be g_freed rather that VIR_FREEd. Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/esx/esx_vi.c | 18 +++++++++--------- src/esx/esx_vi_types.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 7e05318fdc..2eb8048858 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -805,19 +805,19 @@ ESX_VI__TEMPLATE__FREE(Context, virMutexDestroy(item->sessionLock); =20 esxVI_CURL_Free(&item->curl); - VIR_FREE(item->url); - VIR_FREE(item->ipAddress); - VIR_FREE(item->username); - VIR_FREE(item->password); + g_free(item->url); + g_free(item->ipAddress); + g_free(item->username); + g_free(item->password); esxVI_ServiceContent_Free(&item->service); esxVI_UserSession_Free(&item->session); - VIR_FREE(item->sessionLock); + g_free(item->sessionLock); esxVI_Datacenter_Free(&item->datacenter); - VIR_FREE(item->datacenterPath); + g_free(item->datacenterPath); esxVI_ComputeResource_Free(&item->computeResource); - VIR_FREE(item->computeResourcePath); + g_free(item->computeResourcePath); esxVI_HostSystem_Free(&item->hostSystem); - VIR_FREE(item->hostSystemName); + g_free(item->hostSystemName); esxVI_SelectionSpec_Free(&item->selectSet_folderToChildEntity); esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToParent); esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToVm); @@ -1419,7 +1419,7 @@ ESX_VI__TEMPLATE__ALLOC(Response) /* esxVI_Response_Free */ ESX_VI__TEMPLATE__FREE(Response, { - VIR_FREE(item->content); + g_free(item->content); =20 xmlFreeDoc(item->document); }) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 6821587e44..4d3617e0a8 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -900,8 +900,8 @@ ESX_VI__TEMPLATE__ALLOC(AnyType) ESX_VI__TEMPLATE__FREE(AnyType, { xmlFreeNode(item->node); - VIR_FREE(item->other); - VIR_FREE(item->value); + g_free(item->other); + g_free(item->value); }) =20 const char * @@ -1117,7 +1117,7 @@ ESX_VI__TEMPLATE__FREE(String, { esxVI_String_Free(&item->_next); =20 - VIR_FREE(item->value); + g_free(item->value); }) =20 /* esxVI_String_Validate */ @@ -1421,7 +1421,7 @@ ESX_VI__TEMPLATE__ALLOC(DateTime) /* esxVI_DateTime_Free */ ESX_VI__TEMPLATE__FREE(DateTime, { - VIR_FREE(item->value); + g_free(item->value); }) =20 /* esxVI_DateTime_Validate */ @@ -1564,8 +1564,8 @@ ESX_VI__TEMPLATE__ALLOC(Fault); /* esxVI_Fault_Free */ ESX_VI__TEMPLATE__FREE(Fault, { - VIR_FREE(item->faultcode); - VIR_FREE(item->faultstring); + g_free(item->faultcode); + g_free(item->faultstring); }) =20 /* esxVI_Fault_Validate */ @@ -1595,7 +1595,7 @@ ESX_VI__TEMPLATE__ALLOC(MethodFault); /* esxVI_MethodFault_Free */ ESX_VI__TEMPLATE__FREE(MethodFault, { - VIR_FREE(item->_actualType); + g_free(item->_actualType); }) =20 int @@ -1638,8 +1638,8 @@ ESX_VI__TEMPLATE__FREE(ManagedObjectReference, { esxVI_ManagedObjectReference_Free(&item->_next); =20 - VIR_FREE(item->type); - VIR_FREE(item->value); + g_free(item->type); + g_free(item->value); }) =20 /* esxVI_ManagedObjectReference_DeepCopy */ @@ -1732,17 +1732,17 @@ ESX_VI__TEMPLATE__ALLOC(Event) ESX_VI__TEMPLATE__FREE(Event, { esxVI_Event_Free(&item->_next); - VIR_FREE(item->_actualType); + g_free(item->_actualType); =20 esxVI_Int_Free(&item->key); esxVI_Int_Free(&item->chainId); esxVI_DateTime_Free(&item->createdTime); - VIR_FREE(item->userName); + g_free(item->userName); /* FIXME: datacenter is currently ignored */ /* FIXME: computeResource is currently ignored */ /* FIXME: host is currently ignored */ esxVI_VmEventArgument_Free(&item->vm); - VIR_FREE(item->fullFormattedMessage); + g_free(item->fullFormattedMessage); }) =20 /* esxVI_Event_Validate */ --=20 2.29.2 From nobody Fri May 3 07:42:56 2024 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=1613107750; cv=none; d=zohomail.com; s=zohoarc; b=IK+EI2wkKilYHvVKslTyTVw4ESYFZRXeUhlKSnHN0rSjiueaFcByl1RZMR5Af05myk9PkhW9IbeM4eRyrvqYOEHhBOricp9qF+pPbTzWvZrGvidkVxweWhM9FzcSRY7AGQvHSj73rFyv5vBywTRHuGedriSc7IfdC8oBxCSukHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107750; 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=v0ne7EYgnfqQlly/M8M5bEG/kxqXemeZOB00AS3PdXw=; b=L0lMXoyKQqsPMAjHZ5YauOmTMjk4zr3AYkzQgAAmC8Xxld8C+06gcvsjWO2aZgg2/sAqYvQQSU16OO5IWcd/KLkcEqGCjxDEDJeWDi1BmhHr7ht9Mvc8mjX5aSTCX2WOshSN1QBL+cdek78UcrQqduo+icuZHf+MpP8cFqUe+vc= 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 161310775014818.734443471404575; Thu, 11 Feb 2021 21:29:10 -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-521-WmnpI2l0O2WuHCLOuzb_Dw-1; Fri, 12 Feb 2021 00:29:02 -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 0C202107ACED; Fri, 12 Feb 2021 05:28:53 +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 DC92D60C64; Fri, 12 Feb 2021 05:28:52 +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 A5CF957DFD; Fri, 12 Feb 2021 05:28:52 +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 11C5SOW4017137 for ; Fri, 12 Feb 2021 00:28:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id BCB3310016F6; Fri, 12 Feb 2021 05:28:24 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84F4C10013D7 for ; Fri, 12 Feb 2021 05:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107749; 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=v0ne7EYgnfqQlly/M8M5bEG/kxqXemeZOB00AS3PdXw=; b=EiFrONMqkmMojMwbam7kB8uAmfBARWInfIdZ/unH7AnmJyLVC5S67CJnHkjcadSxA6vOKD +PRILl1poqI5dMQNvTOb5/3ClA2A4Q0kVMhlw6UHvlxHoCgt/L5/BM7RrW+ot8MGN/REu7 Cpj2OlDyVcHNSK+ihHYLkzEzXXBj/8s= X-MC-Unique: WmnpI2l0O2WuHCLOuzb_Dw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 2/8] conf: convert VIR_FREE to g_free in other functions that free their arg Date: Fri, 12 Feb 2021 00:28:12 -0500 Message-Id: <20210212052818.684878-3-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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" Previous patches have converted VIR_FREE to g_free in functions with names ending in Free() and Dispose(), but there are a few similar functions with names that don't fit that pattern, but server the same purpose (and thus can survive the same conversion). in particular *Free*(), and *Unref(). Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/conf/capabilities.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index dd3321db9a..69d9bb0e38 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -118,10 +118,10 @@ virCapabilitiesFreeHostNUMACell(virCapsHostNUMACellPt= r cell) =20 virCapabilitiesClearHostNUMACellCPUTopology(cell->cpus, cell->ncpus); =20 - VIR_FREE(cell->cpus); - VIR_FREE(cell->siblings); - VIR_FREE(cell->pageinfo); - VIR_FREE(cell); + g_free(cell->cpus); + g_free(cell->siblings); + g_free(cell->pageinfo); + g_free(cell); } =20 static void @@ -129,9 +129,9 @@ virCapabilitiesFreeGuestMachine(virCapsGuestMachinePtr = machine) { if (machine =3D=3D NULL) return; - VIR_FREE(machine->name); - VIR_FREE(machine->canonical); - VIR_FREE(machine); + g_free(machine->name); + g_free(machine->canonical); + g_free(machine); } =20 static void @@ -141,13 +141,13 @@ virCapabilitiesFreeGuestDomain(virCapsGuestDomainPtr = dom) if (dom =3D=3D NULL) return; =20 - VIR_FREE(dom->info.emulator); - VIR_FREE(dom->info.loader); + g_free(dom->info.emulator); + g_free(dom->info.loader); for (i =3D 0; i < dom->info.nmachines; i++) virCapabilitiesFreeGuestMachine(dom->info.machines[i]); - VIR_FREE(dom->info.machines); + g_free(dom->info.machines); =20 - VIR_FREE(dom); + g_free(dom); } =20 void @@ -157,17 +157,17 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest) if (guest =3D=3D NULL) return; =20 - VIR_FREE(guest->arch.defaultInfo.emulator); - VIR_FREE(guest->arch.defaultInfo.loader); + g_free(guest->arch.defaultInfo.emulator); + g_free(guest->arch.defaultInfo.loader); for (i =3D 0; i < guest->arch.defaultInfo.nmachines; i++) virCapabilitiesFreeGuestMachine(guest->arch.defaultInfo.machines[i= ]); - VIR_FREE(guest->arch.defaultInfo.machines); + g_free(guest->arch.defaultInfo.machines); =20 for (i =3D 0; i < guest->arch.ndomains; i++) virCapabilitiesFreeGuestDomain(guest->arch.domains[i]); - VIR_FREE(guest->arch.domains); + g_free(guest->arch.domains); =20 - VIR_FREE(guest); + g_free(guest); } =20 =20 @@ -177,7 +177,7 @@ virCapabilitiesFreeStoragePool(virCapsStoragePoolPtr po= ol) if (!pool) return; =20 - VIR_FREE(pool); + g_free(pool); } =20 =20 @@ -190,7 +190,7 @@ virCapabilitiesHostNUMAUnref(virCapsHostNUMAPtr caps) if (g_atomic_int_dec_and_test(&caps->refs)) { g_ptr_array_unref(caps->cells); =20 - VIR_FREE(caps); + g_free(caps); } } =20 @@ -409,7 +409,7 @@ virCapabilitiesFreeMachines(virCapsGuestMachinePtr *mac= hines, virCapabilitiesFreeGuestMachine(machines[i]); machines[i] =3D NULL; } - VIR_FREE(machines); + g_free(machines); } =20 /** --=20 2.29.2 From nobody Fri May 3 07:42:56 2024 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=1613107743; cv=none; d=zohomail.com; s=zohoarc; b=QKcFs9eE88S/KbgGt9WyVMA4OsjONcZIdJZMbplyqrPlQARp3zESw3+F0MuKGeNfC5h6fRUTf5OvCb5lQyyWQ+AMPN1voYQ+jH5HGviyjKQ7Ukxqa9e6UsRPk1VuydbiN5rIrMITLR/oHXUcnlEhl5PnvzBsZx1vK++1eUmarJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107743; 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=dI9/C+PyG89BMGayS+keqNd9SvL3NELvdvFX1Ko88GI=; b=MBHu9HV4C4DFD3GEZSzGpN8vWn/MR1PJmAjC+MjXeN3z27xGe7d830CDAOECTVksBO5sdX+JjVg2CP05kZHRgMq5vPQPcaxAOUfNxaY/ALTJD+aKMe2ygmiEirwS9vMOR5HkI9rf9yKGh7kQlopobt0+OkeBAlmoYrnMzTA38iM= 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 1613107743565821.285757665894; Thu, 11 Feb 2021 21:29:03 -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-105-BYVhfCmWO4-3f1-a4O1epQ-1; Fri, 12 Feb 2021 00:28:37 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0768427C5; Fri, 12 Feb 2021 05:28:30 +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 146535D9F8; Fri, 12 Feb 2021 05:28:30 +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 7B3AE4EE76; Fri, 12 Feb 2021 05:28:26 +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 11C5SPuo017144 for ; Fri, 12 Feb 2021 00:28:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 244E310016F6; Fri, 12 Feb 2021 05:28:25 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id E151410013D7 for ; Fri, 12 Feb 2021 05:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107742; 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=dI9/C+PyG89BMGayS+keqNd9SvL3NELvdvFX1Ko88GI=; b=VBfMN0ZAWTCgpfVe3XDyO+s0suPBGdTOKSc+Z3FkTzvaJZ4hatbz3SFJbvvEZ0qab7YOCM aYbKv3aoc+GKoq+Zwm+XsXt6KKFh07G69NWcTxzJ+y/juHRCqQb3P7ZHMi7WmFktKrWaqg vpmDP3LcKVDgPt91f3AyUnz8cyRvyx8= X-MC-Unique: BYVhfCmWO4-3f1-a4O1epQ-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 3/8] locking: convert VIR_FREE to g_free in other functions that free their arg Date: Fri, 12 Feb 2021 00:28:13 -0500 Message-Id: <20210212052818.684878-4-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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.14 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 Reviewed-by: Michal Privoznik --- src/locking/lock_manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index db724eb30f..90ec5cdfbe 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -245,8 +245,8 @@ void virLockManagerPluginUnref(virLockManagerPluginPtr = plugin) return; } =20 - VIR_FREE(plugin->name); - VIR_FREE(plugin); + g_free(plugin->name); + g_free(plugin); } #else /* !WITH_DLFCN_H */ void virLockManagerPluginUnref(virLockManagerPluginPtr plugin G_GNUC_UNUSE= D) --=20 2.29.2 From nobody Fri May 3 07:42:56 2024 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=1613107722; cv=none; d=zohomail.com; s=zohoarc; b=EJxlXMWFmHxnD3mir2ot82stVNpnmWeci6K8Zel6VQ1Q35v7tPcr0tIplknAQshwMzrS7d5g8fosqUgpd90Dp8UnUmMJcwwtsVJp3h7fWeSShSPM9Z01jzLYM/7kkcJEZp7WNAMvTYUG7tHc2ftFLJBgJqIeTaLI3RoBtVMbmGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107722; 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=tlxsYJPTChEjOpKW2PpqrdJRgdTYuCovSPpKQ07Mkjk=; b=oEFM3txpS8XIpTgd/Hps9P8AbPC87Tyq3kUM06U+DZpsOPjFmmxYISaHO+hChl0KE/glJdDEbeoEJmRuskKfVYAuXLV3ASCo0BtRIP3GJxaqJ7NpToeS7ZCk3b3t6U/vyDy8veEO51GQ29vn3rNAb1udZse+LucmU1BRmBlYAKg= 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 1613107722076369.23085373463493; Thu, 11 Feb 2021 21:28:42 -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-221-MXsmTXUzNWm6Z-M1VhfNbg-1; Fri, 12 Feb 2021 00:28:38 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA3E6801962; Fri, 12 Feb 2021 05:28:32 +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 A6A481D5; Fri, 12 Feb 2021 05:28:32 +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 6ABEA383D; Fri, 12 Feb 2021 05:28:32 +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 11C5SP6U017150 for ; Fri, 12 Feb 2021 00:28:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8081010016F6; Fri, 12 Feb 2021 05:28:25 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 482E910013D7 for ; Fri, 12 Feb 2021 05:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107720; 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=tlxsYJPTChEjOpKW2PpqrdJRgdTYuCovSPpKQ07Mkjk=; b=PmTL6lWhwEvPRZT7ByiTqGW09dVLyodFvV9b13XRZG8ies7UoEYXO9BmeuXpmz46MpTgkj wiXnL2ExZSofv7PIxTeVlWvLyj0EitGKvEnNy7nYXQANCoq4JPILlWiz8yAylQSj8Ch43z YUDrDLLJfFLovCPNOgKM7haGkuyw/pU= X-MC-Unique: MXsmTXUzNWm6Z-M1VhfNbg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 4/8] openvz: convert VIR_FREE to g_free in other functions that free their arg Date: Fri, 12 Feb 2021 00:28:14 -0500 Message-Id: <20210212052818.684878-5-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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.14 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 Reviewed-by: Michal Privoznik --- src/openvz/openvz_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 1783dce233..041a031a3a 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -478,7 +478,7 @@ openvzFreeDriver(struct openvz_driver *driver) virObjectUnref(driver->xmlopt); virObjectUnref(driver->domains); virObjectUnref(driver->caps); - VIR_FREE(driver); + g_free(driver); } =20 =20 --=20 2.29.2 From nobody Fri May 3 07:42:56 2024 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=1613107734; cv=none; d=zohomail.com; s=zohoarc; b=A68KBVIBuurRXoCH/WqWvwHqaRNzJ3iN4zexL4H7e9vCPFvI9qvZ6Dj9n/OQvoMWabIDLUcEtuZcU2XLxUYdkLd2ToyAczuwvzFe3z5gbR2jncEMHsk9mluauNAo/PO0V27cN3p2mNOsPZbVeWZpMEpxEsBy6KZU6jfBImmweyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107734; 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=jLiH+uKO5q0/XjIXlY+JW72U+9dfsXdWq6LjTpC9odU=; b=JnzxVy1pKyxl58ylOrCvNaOUk6AwJA5UHN54oAg+E3Or35hO6H1Twr33OvWexzY01RTPbfc1CDpHxinZleDYm4clDlaPSOGJ43t0poxULqCPXhhnXiOnm0lbrQVfuizH3jsgO3WST4vFQGOtj5/XBjAxa24m6p48kb7it5loitQ= 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 161310773420470.29252468442007; Thu, 11 Feb 2021 21:28:54 -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-276-woupia2vM9ucvjSC7e-Wmg-1; Fri, 12 Feb 2021 00:28:51 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0488427D1; Fri, 12 Feb 2021 05:28:45 +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 AF5235D9F8; Fri, 12 Feb 2021 05:28:45 +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 7A72C18095CC; Fri, 12 Feb 2021 05:28:45 +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 11C5SPJ0017156 for ; Fri, 12 Feb 2021 00:28:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id DC3DF10016F6; Fri, 12 Feb 2021 05:28:25 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id A321A10013D7 for ; Fri, 12 Feb 2021 05:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107733; 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=jLiH+uKO5q0/XjIXlY+JW72U+9dfsXdWq6LjTpC9odU=; b=dnLINEYdeDPvLmdWRSx6lkt7TLXGQLuJS22ywn2FN0IouYckNAj+K62kxH7hBmw7XaMZA/ IQ3+c2ZwuBnmrri7ucZmd38QgdDd8oR9tEjY1MuqTdqAp28+nKD35xW4Ta10PS4xoyJWAO /QQc0KHEWkws5cc9eYCR37cM3gbqU8s= X-MC-Unique: woupia2vM9ucvjSC7e-Wmg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 5/8] remote: convert VIR_FREE to g_free in other functions that free their arg Date: Fri, 12 Feb 2021 00:28:15 -0500 Message-Id: <20210212052818.684878-6-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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.14 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 Reviewed-by: Michal Privoznik --- src/remote/remote_daemon_stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index b4a3cb6741..57816eb10e 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -419,7 +419,7 @@ int daemonFreeClientStream(virNetServerClientPtr client, } =20 virObjectUnref(stream->st); - VIR_FREE(stream); + g_free(stream); =20 return ret; } --=20 2.29.2 From nobody Fri May 3 07:42:56 2024 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=1613107810; cv=none; d=zohomail.com; s=zohoarc; b=N7BS1+HAYRuAYjDo3/CoFhgc3uiZmLaELtSFJJDQqf9O7+OALUqvVqE03ZZ/R5EVwbCcj1M+ezPLQ6Ahwh0qJ87TEBvmPJs7BfpZ4+n3SdkItsXJN7Cev15nR2X3sAtt3Emg/gJ0U/u3CWmbE9QpTds/YLl9hgwdj+L7G0HmR8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107810; 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=XL3oCK3yuoTCPVvlpNmb+Eu5Nyxmjx0b1g6i2v6El/E=; b=aPwxUkbr0BqNeFBUlWmcNvzEP1PvnZKTpMwTpLtSZDIe6WFR4RB9iiePOdIRLcZmfT5fzN3UI3ZyRmaD5hHOABa2zq5Kw+UfH2hW28y5vZqeLl5MfK7GdqNbcTQxi3fjF6KOxZ/Z+c04x3gseJoz6Xt5/SC4Kr3+5z9024Q9rLg= 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 1613107809920456.8541188593516; Thu, 11 Feb 2021 21:30: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-521-bbheBMlaMwWP0qANPZhVJg-1; Fri, 12 Feb 2021 00:29:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC067801984; Fri, 12 Feb 2021 05:28:55 +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 96C762BFEC; Fri, 12 Feb 2021 05:28:55 +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 5A0433807; Fri, 12 Feb 2021 05:28:55 +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 11C5SQkf017164 for ; Fri, 12 Feb 2021 00:28:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 433E710016F6; Fri, 12 Feb 2021 05:28:26 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BD3610013D7 for ; Fri, 12 Feb 2021 05:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107808; 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=XL3oCK3yuoTCPVvlpNmb+Eu5Nyxmjx0b1g6i2v6El/E=; b=F5KHs3tKIONdARs9AY0P+IODQCMOgAWYyMJ2bW3N8cIY+EL2+N/v+BpRkp2iEdFtITAKbJ v9JiDKfQ7ytfWC2F7KMkPMaash3ont7+V988l/+0gYKFOswZCoSX3njZy5DCmrc1ZzIAih lWZrbfRy4vthfJhwqb5GEh18Pw1YPLc= X-MC-Unique: bbheBMlaMwWP0qANPZhVJg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 6/8] qemu: convert VIR_FREE to g_free in other functions that free their arg Date: Fri, 12 Feb 2021 00:28:16 -0500 Message-Id: <20210212052818.684878-7-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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.11 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 Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 14d05cfe3b..13efdcbad1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -95,7 +95,7 @@ qemuJobFreePrivate(void *opaque) return; =20 qemuMigrationParamsFree(priv->migParams); - VIR_FREE(priv); + g_free(priv); } =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 53ac3b0c17..58236f1ae2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17677,12 +17677,12 @@ qemuDomainFreeResctrlMonData(virQEMUResctrlMonDat= aPtr resdata) { size_t i =3D 0; =20 - VIR_FREE(resdata->name); - VIR_FREE(resdata->vcpus); + g_free(resdata->name); + g_free(resdata->vcpus); for (i =3D 0; i < resdata->nstats; i++) virResctrlMonitorStatsFree(resdata->stats[i]); - VIR_FREE(resdata->stats); - VIR_FREE(resdata); + g_free(resdata->stats); + g_free(resdata); } =20 =20 --=20 2.29.2 From nobody Fri May 3 07:42:56 2024 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=1613107738; cv=none; d=zohomail.com; s=zohoarc; b=hlIhg7pFQDZy/YvYUnYBTt0LnKmsbfSS3z4xHiad7RGelD4eVZTa5s1199TyvLNYsWbl4qkEGI7jYkPJSrsfWVXiAcVxHb8l/e4tGxINcxAa/EbGE1l5eR4H2pFPciHnfktAkb59u4Zh87qTkTMYN+1VfRlYN5IWKSkVhNI1Ihc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107738; 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=AtBbcinbbp3X1nivVpzhHvLKsrtO/SQe7sLbkjI/9BM=; b=PgVGMH1UH/jDGhPjysksqOaPhOK7rW8vaau0Pc20/J60E+BaQuQ+s3CT/5vN4zt658ww5n9m5q8i2gx+KxwjuIR+A+FvCXOJMqgHEwjOXMhEtOlTXJyli2/r2IHRGP0WtvNatqnG0LJyEYitqYz17DwXYEf7L6j3vo/E3HPjGWY= 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 1613107738153735.6698571363168; Thu, 11 Feb 2021 21:28:58 -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-512-ceLY5y4_NmmxGFuCuu8Wqw-1; Fri, 12 Feb 2021 00:28:54 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D847B1009622; Fri, 12 Feb 2021 05:28:48 +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 AFAB01F4; Fri, 12 Feb 2021 05:28:48 +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 76BC957DFD; Fri, 12 Feb 2021 05:28:48 +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 11C5SQPA017172 for ; Fri, 12 Feb 2021 00:28:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9F22A10016F6; Fri, 12 Feb 2021 05:28:26 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66E6910013D7 for ; Fri, 12 Feb 2021 05:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107737; 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=AtBbcinbbp3X1nivVpzhHvLKsrtO/SQe7sLbkjI/9BM=; b=bePR/6nsq+buwb4leu8C9nU3GbfFccFk84BVXnrWGqq3inugJyV17RiHygAecnEmCg3uq3 u3I6L16NqKMnADdk43Qmsh/N8gfoD5ntwKluMVkCqoFIcpww5gYFCAv2gVFwvP70OZu19A Scs0CaOzNzNzBA7DwMO3+5/FbMvlJAc= X-MC-Unique: ceLY5y4_NmmxGFuCuu8Wqw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 7/8] util: convert VIR_FREE to g_free in other functions that free their arg Date: Fri, 12 Feb 2021 00:28:17 -0500 Message-Id: <20210212052818.684878-8-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/util/virconf.c | 4 ++-- src/util/virerror.c | 4 ++-- src/util/virobject.c | 2 +- src/util/virstring.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index d85fc32b64..16107bce96 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -151,11 +151,11 @@ virConfFreeValue(virConfValuePtr val) return; if (val->type =3D=3D VIR_CONF_STRING && val->str !=3D NULL) - VIR_FREE(val->str); + g_free(val->str); if (val->type =3D=3D VIR_CONF_LIST && val->list !=3D NULL) virConfFreeList(val->list); - VIR_FREE(val); + g_free(val); } =20 virConfPtr diff --git a/src/util/virerror.c b/src/util/virerror.c index 14054add41..708081414a 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -158,7 +158,7 @@ virLastErrFreeData(void *data) if (!err) return; virResetError(err); - VIR_FREE(err); + g_free(err); } =20 =20 @@ -477,7 +477,7 @@ void virFreeError(virErrorPtr err) { virResetError(err); - VIR_FREE(err); + g_free(err); } =20 /** diff --git a/src/util/virobject.c b/src/util/virobject.c index ce40ffae22..370a64bd6d 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -655,5 +655,5 @@ virObjectListFreeCount(void *list, for (i =3D 0; i < count; i++) virObjectUnref(((void **)list)[i]); =20 - VIR_FREE(list); + g_free(list); } diff --git a/src/util/virstring.c b/src/util/virstring.c index c98435388a..c3e64007fe 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -108,9 +108,9 @@ virStringListFreeCount(char **strings, return; =20 for (i =3D 0; i < count; i++) - VIR_FREE(strings[i]); + g_free(strings[i]); =20 - VIR_FREE(strings); + g_free(strings); } =20 =20 --=20 2.29.2 From nobody Fri May 3 07:42:56 2024 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=1613107748; cv=none; d=zohomail.com; s=zohoarc; b=P8bM2OsNdgkeWvJe+b7QfDYvvIO0W8+dHXTlK3ebhTQfUv5OXLZvZ+J6nr+DSRRgRjfHoRY6BCeyJaA/shakIIEB6sWVxPgcoltJUTcn+4zePks5zJy8r1ng8wE2HvlYpeAqlcWb+ioDuM6O9ermO/yyTdviMrCrSpJ5RmIzG8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613107748; 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=IZNvC7Z59SGDFC6U8vVr1Y8Y8/WWn6Ve/vRJzerB4Gw=; b=RZsFLMg+hppXQwtj/N6FhEfIre4qqGNuemNByLphqs4xTFIZiq1L8Xj2XHkXqAlKZKQVgzJNi4umRex7wp46OFOVmq7gxPwmQ8hXaZWN5L9rQ6xRT2OsTFB5KMIkQddjqkRA38kprMuE9rCZURC1lj92ekHtySL6ikECobGeQFM= 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 1613107747712748.9141309277894; Thu, 11 Feb 2021 21:29:07 -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-596-j3QN9bYKMm-du1SZG2bHHg-1; Fri, 12 Feb 2021 00:29:04 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C89C080196C; Fri, 12 Feb 2021 05:28:58 +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 9E96E1A87D; Fri, 12 Feb 2021 05:28:58 +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 68FC01809C8F; Fri, 12 Feb 2021 05:28:58 +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 11C5SRAB017182 for ; Fri, 12 Feb 2021 00:28:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0648110016F6; Fri, 12 Feb 2021 05:28:27 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-48.phx2.redhat.com [10.3.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id C245210013D7 for ; Fri, 12 Feb 2021 05:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613107746; 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=IZNvC7Z59SGDFC6U8vVr1Y8Y8/WWn6Ve/vRJzerB4Gw=; b=C9oxm+7RKEYNdQfoZsGAPZxPxA69csS54v3j4CjMHazK0CZCTZT5VEM/ssKEo5TeWWyE1N Ec683UEnsjb5kTAS6LPIBnPSbtOe/z0Np51XBC3mXXME4bVQo+kt/Wv+pjMGO3vS+gnHdH 5TXl21BBFKPRDkJbZ87fq8OS8OhOt5I= X-MC-Unique: j3QN9bYKMm-du1SZG2bHHg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 8/8] vmware: convert VIR_FREE to g_free in other functions that free their arg Date: Fri, 12 Feb 2021 00:28:18 -0500 Message-Id: <20210212052818.684878-9-laine@redhat.com> In-Reply-To: <20210212052818.684878-1-laine@redhat.com> References: <20210212052818.684878-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.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/vmware/vmware_conf.c | 4 ++-- src/vmware/vmware_driver.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 55cd1d6f2d..f905962b85 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -56,8 +56,8 @@ vmwareFreeDriver(struct vmware_driver *driver) virObjectUnref(driver->domains); virObjectUnref(driver->caps); virObjectUnref(driver->xmlopt); - VIR_FREE(driver->vmrun); - VIR_FREE(driver); + g_free(driver->vmrun); + g_free(driver); } =20 =20 diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 481c59ef3c..5f1edeb7f5 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -110,8 +110,8 @@ vmwareDataFreeFunc(void *data) { vmwareDomainPtr dom =3D data; =20 - VIR_FREE(dom->vmxPath); - VIR_FREE(dom); + g_free(dom->vmxPath); + g_free(dom); } =20 static int --=20 2.29.2