From nobody Mon Apr 29 13:59:25 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=1612160862; cv=none; d=zohomail.com; s=zohoarc; b=hdNdoVgp1J7CoL3cIHKP97D84ifLvKfZwuYL1t27pFs9vOO41vqw3dIZyJLuyVAsAlOpXTAoAulvRDIQoxIftWgqPIXzC1TzJ/TGvARVXtPA4Cq8QsZDO15suAp7wkHk9KHq3c/9WLfCNRGwaINwJMpZnP3j0cqEdqnigvt75jA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160862; 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=tQeG6a5kWjVSNibcmtF+gpVURZZHInb04GXO57NuUI8=; b=Srx13BHWVOWMjetM8kz58VolKau8z5drsKpXd7T2yw6EgElGMouRwGt3Y9ufeYWGN+AlAUCfCrDtrki9USTpO5irovnsaXJeyHo9Pj024o4t1ZLaPOlDNabP6FfoNdlbS4BKqKKmYYC93T7LXzD7z6IFP1va060fmiGexIJ4FHc= 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 1612160862759854.8350267974547; Sun, 31 Jan 2021 22:27: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-441-55piirjDPnq347i8cmWv8Q-1; Mon, 01 Feb 2021 01:27:39 -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 7BF871005513; Mon, 1 Feb 2021 06:27:33 +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 2CE485D9DC; Mon, 1 Feb 2021 06:27: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 3AF5A180954D; Mon, 1 Feb 2021 06:27:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RQrG025968 for ; Mon, 1 Feb 2021 01:27:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9B68A70497; Mon, 1 Feb 2021 06:27:26 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 670EB70476 for ; Mon, 1 Feb 2021 06:27:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160861; 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=tQeG6a5kWjVSNibcmtF+gpVURZZHInb04GXO57NuUI8=; b=bJBR9rmEUTnD6e/bj+L3kIX1IP7YD+yIdQg64jhZ9sN1yLYSBwHHN3O9V45hsZDuGiOA2v B/hXu6RI8i0HA4DeKPSQ+Db6m2LG3dIQe/6dn7nwXGtIWGI1nUiOY4PMDnJ7W1RkKSAtcr PylZ5mDMdPj5oNHN6DxZpIR0g+jpClM= X-MC-Unique: 55piirjDPnq347i8cmWv8Q-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 1/8] log error if virConnectCacheOnceInit() fails Date: Mon, 1 Feb 2021 01:27:13 -0500 Message-Id: <20210201062720.425041-2-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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" This may be pointless, but I noticed it and it was bugging me. virGetConnectNetwork() calls virGetConnectGeneric(), which calls virConnecCacheInitialize(), which is actually a call (only once) to virConnectCacheOnceInit() which calls virThreadLocalInit() several times, which calls pthread_key_create() If pthread_key_create() fails, it (of course) doesn't log an error (because it's not a part of libvirt), nor does any other function on the call chain all the way up to virGetConnectNetwork(). But none of the callers of virGetConnectNetwork() log an error either, so it is possible that an API could fail due to virGetConnectNetwork() failing, but would only log "an error was encountered, but the cause is unknown. Deal with it." (paraphrasing). In all likelyhood, virConnectCacheOnceInit() is going to be called at some earlier time, and almost certainly pthread_key_create() will never fail (and if it does, the user will have *much* bigger problems than an obtuse error message from libvirt). So I don't know if there's any value at all in pushing this. Just throwing it out there... Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/driver.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/driver.c b/src/driver.c index e005a89d57..1dae7cf284 100644 --- a/src/driver.c +++ b/src/driver.c @@ -116,18 +116,18 @@ virThreadLocal connectStorage; static int virConnectCacheOnceInit(void) { - if (virThreadLocalInit(&connectInterface, NULL) < 0) - return -1; - if (virThreadLocalInit(&connectNetwork, NULL) < 0) - return -1; - if (virThreadLocalInit(&connectNWFilter, NULL) < 0) - return -1; - if (virThreadLocalInit(&connectNodeDev, NULL) < 0) - return -1; - if (virThreadLocalInit(&connectSecret, NULL) < 0) - return -1; - if (virThreadLocalInit(&connectStorage, NULL) < 0) + if (virThreadLocalInit(&connectInterface, NULL) < 0 + || virThreadLocalInit(&connectNetwork, NULL) < 0 + || virThreadLocalInit(&connectNWFilter, NULL) < 0 + || virThreadLocalInit(&connectNodeDev, NULL) < 0 + || virThreadLocalInit(&connectSecret, NULL) < 0 + || virThreadLocalInit(&connectStorage, NULL) < 0) { + + virReportSystemError(errno, "%s", + _("Unable to initialize thread local variable= ")); return -1; + } + return 0; } =20 --=20 2.29.2 From nobody Mon Apr 29 13:59:25 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=1612160880; cv=none; d=zohomail.com; s=zohoarc; b=cOJwLeWWzktcnTLKF+Qqi6QszA4H6Fv01MMROpMv7apzLBquwADhnqweDTYcwb6JR/J2GVahCldJsMouFB13jAaIKl1U6YN4Jl8cU1mqXHDVRpUJPIC/3UrHeLwtSmAWvw6b7GS1ZnI1IAPiK6xPDjagb2eOwmOHH+hpRZUPZzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160880; 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=AJnbZI2Zh8Vkm+v7HCZYfrKwWP8Ha0deH2WvEC302WQ=; b=F6vaeJKu0Bc4mKIMPjJWdkHim1WovXaBnfVZjsotsYcMPdi5YM231Cv1M+NDXt4vAVvwcdjiIwRQlmSTizKeHcaHGqPb69wZMbpnYiv0t7zkNOtmFMscI5mTAWAAmvsioOwmDXs29wl/yxyR+osOBCW5xT4oqTz30D6WiwI3SIE= 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 1612160880583621.7385082293432; Sun, 31 Jan 2021 22:28:00 -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-378-VOkQm4iuNia-V02UK4Wj4w-1; Mon, 01 Feb 2021 01:27:57 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 047CAC7403; Mon, 1 Feb 2021 06:27:52 +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 D808F10016F5; Mon, 1 Feb 2021 06:27:51 +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 A0FBE1809CA2; Mon, 1 Feb 2021 06:27:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RR2d025974 for ; Mon, 1 Feb 2021 01:27:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id F3C4770497; Mon, 1 Feb 2021 06:27:26 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD4F670476 for ; Mon, 1 Feb 2021 06:27:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160879; 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=AJnbZI2Zh8Vkm+v7HCZYfrKwWP8Ha0deH2WvEC302WQ=; b=CYvmD62rUxy6xckzu53/qFiyjLYZnu+Yq8r8B6qYE24r8lXAq7HPkWen7KrDlCWQih19kk JCZlLFL8FPHm8VmMX45hMOtCH2u/FxLebw3kjyu6nJ6+MwjxPtMBybmOtfx5HkwPC17VJy WKr9RQkqJxMcKK1UFjKlzG+sJKW6hQM= X-MC-Unique: VOkQm4iuNia-V02UK4Wj4w-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 2/8] hostdevmgr: remove unneeded oldStateDir Date: Mon, 1 Feb 2021 01:27:14 -0500 Message-Id: <20210201062720.425041-3-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.22 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" Back in commit 2c71d3826, which appeared in libvirt-1.2.3 in April 2014, the location used to store saved MAC addresses and vlan tags of SRIOV VFs was changed from /var/run/libvirt/qemu to /var/run/libvirt/hostdevmgr. For backward compatibility the code was made to continue looking in the old location for the files when it didn't find them in the new location. It's now been 6 years, and even if there was somebody still running libvirt-1.2.3 on their system, that system would now be out of support for libvirt, so there would be no way for them to upgrade to a new libvirt that no longer looks in "oldStateDir" for the files. So let's no longer look in "oldStateDir" for the files! Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/hypervisor/virhostdev.c | 60 ++++++++----------------------------- src/hypervisor/virhostdev.h | 6 ++-- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 4 +-- src/qemu/qemu_hostdev.c | 3 +- tests/virhostdevtest.c | 10 +++---- 6 files changed, 23 insertions(+), 62 deletions(-) diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index bd35397f2c..09995a52ed 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -484,17 +484,9 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev, } =20 =20 -/* @oldStateDir: - * For upgrade purpose: - * To an existing VM on QEMU, the hostdev netconfig file is originally sto= red - * in cfg->stateDir (/var/run/libvirt/qemu). Switch to new version, it use= s new - * location (mgr->stateDir) but certainly will not find it. In this - * case, try to find in the old state dir. - */ static int virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev, - const char *stateDir, - const char *oldStateDir) + const char *stateDir) { g_autofree char *linkdev =3D NULL; g_autofree virMacAddrPtr MAC =3D NULL; @@ -528,16 +520,11 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hos= tdev, NULL, port_profile_associate); } else { - /* we need to try 3 different places for the config file: + /* we need to try 2 different places for the config file: * 1) ${stateDir}/${PF}_vf${vf} * This is almost always where the saved config is * - * 2) ${oldStateDir/${PF}_vf${vf} - * saved config is only here if this machine was running a - * (by now *very*) old version of libvirt that saved the - * file in a different directory - * - * 3) ${stateDir}${PF[1]}_vf${VF} + * 2) ${stateDir}${PF[1]}_vf${VF} * PF[1] means "the netdev for port 2 of the PF device", and * is only valid when the PF is a Mellanox dual port NIC with * a VF that was created in "single port" mode. @@ -556,18 +543,7 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr host= dev, return -1; } =20 - /* 2) "old" (pre-1.2.3 circa 2014) location - whenever we get - * to the point that nobody will ever upgrade directly from - * 1.2.3 (or older) directly to current libvirt, we can - * eliminate this clause - **/ - if (!(adminMAC || vlan || MAC) && oldStateDir && - virNetDevReadNetConfig(linkdev, vf, oldStateDir, - &adminMAC, &vlan, &MAC) < 0) { - return -1; - } - - /* 3) try using the PF's "port 2" netdev as the name of the + /* 2) try using the PF's "port 2" netdev as the name of the * config file */ if (!(adminMAC || vlan || MAC)) { @@ -918,7 +894,7 @@ virHostdevPreparePCIDevicesImpl(virHostdevManagerPtr mg= r, resetvfnetconfig: if (last_processed_hostdev_vf >=3D 0) { for (i =3D 0; i <=3D last_processed_hostdev_vf; i++) - virHostdevRestoreNetConfig(hostdevs[i], mgr->stateDir, NULL); + virHostdevRestoreNetConfig(hostdevs[i], mgr->stateDir); } =20 reattachdevs: @@ -960,8 +936,7 @@ virHostdevReAttachPCIDevicesImpl(virHostdevManagerPtr m= gr, const char *dom_name, virPCIDeviceListPtr pcidevs, virDomainHostdevDefPtr *hostdevs, - int nhostdevs, - const char *oldStateDir) + int nhostdevs) { size_t i; =20 @@ -1043,8 +1018,7 @@ virHostdevReAttachPCIDevicesImpl(virHostdevManagerPtr= mgr, if (actual) { VIR_DEBUG("Restoring network configuration of PCI device %= s", virPCIDeviceGetName(actual)); - virHostdevRestoreNetConfig(hostdev, mgr->stateDir, - oldStateDir); + virHostdevRestoreNetConfig(hostdev, mgr->stateDir); } } } @@ -1061,16 +1035,12 @@ virHostdevReAttachPCIDevicesImpl(virHostdevManagerP= tr mgr, } =20 =20 -/* @oldStateDir: - * For upgrade purpose: see virHostdevRestoreNetConfig - */ void virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, const char *drv_name, const char *dom_name, virDomainHostdevDefPtr *hostdevs, - int nhostdevs, - const char *oldStateDir) + int nhostdevs) { g_autoptr(virPCIDeviceList) pcidevs =3D NULL; =20 @@ -1085,7 +1055,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, } =20 virHostdevReAttachPCIDevicesImpl(mgr, drv_name, dom_name, pcidevs, - hostdevs, nhostdevs, oldStateDir); + hostdevs, nhostdevs); } =20 =20 @@ -2120,23 +2090,18 @@ virHostdevPrepareDomainDevices(virHostdevManagerPtr= mgr, return 0; } =20 -/* @oldStateDir - * For upgrade purpose: see virHostdevReAttachPCIHostdevs - */ void virHostdevReAttachDomainDevices(virHostdevManagerPtr mgr, const char *driver, virDomainDefPtr def, - unsigned int flags, - const char *oldStateDir) + unsigned int flags) { if (!def->nhostdevs || !mgr) return; =20 if (flags & VIR_HOSTDEV_SP_PCI) { virHostdevReAttachPCIDevices(mgr, driver, def->name, - def->hostdevs, def->nhostdevs, - oldStateDir); + def->hostdevs, def->nhostdevs); } =20 if (flags & VIR_HOSTDEV_SP_USB) { @@ -2388,8 +2353,7 @@ virHostdevReAttachOneNVMeDevice(virHostdevManagerPtr = hostdev_mgr, goto cleanup; =20 virHostdevReAttachPCIDevicesImpl(hostdev_mgr, - drv_name, dom_name, pciDevices, - NULL, 0, NULL); + drv_name, dom_name, pciDevices, NULL,= 0); =20 for (i =3D 0; i < virNVMeDeviceListCount(nvmeDevices); i++) { virNVMeDevicePtr temp =3D virNVMeDeviceListGet(nvmeDevices, i); diff --git a/src/hypervisor/virhostdev.h b/src/hypervisor/virhostdev.h index 811bda40ed..19e1938d9e 100644 --- a/src/hypervisor/virhostdev.h +++ b/src/hypervisor/virhostdev.h @@ -113,8 +113,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostd= ev_mgr, const char *drv_name, const char *dom_name, virDomainHostdevDefPtr *hostdevs, - int nhostdevs, - const char *oldStateDir) + int nhostdevs) ATTRIBUTE_NONNULL(1); void virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr, @@ -188,8 +187,7 @@ void virHostdevReAttachDomainDevices(virHostdevManagerPtr mgr, const char *driver, virDomainDefPtr def, - unsigned int flags, - const char *oldStateDir) + unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); =20 /* functions used by NodeDevDetach/Reattach/Reset */ diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index afa21bf02e..380f7e0b56 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -868,7 +868,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } =20 virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAM= E, - vm->def, hostdev_flags, NULL); + vm->def, hostdev_flags); =20 VIR_FREE(priv->lockState); if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockStat= e) < 0) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 3eaf106006..f480f8067e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3153,7 +3153,7 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivatePtr = driver, =20 error: virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, - vm->def->name, &hostdev, 1, NULL); + vm->def->name, &hostdev, 1); =20 cleanup: virObjectUnref(cfg); @@ -3690,7 +3690,7 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr = driver, virDomainHostdevRemove(vm->def, idx); =20 virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, - vm->def->name, &hostdev, 1, NULL); + vm->def->name, &hostdev, 1); =20 ret =3D 0; =20 diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 721fe5da82..57971214b7 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -406,11 +406,10 @@ qemuHostdevReAttachPCIDevices(virQEMUDriverPtr driver, int nhostdevs) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - const char *oldStateDir =3D cfg->stateDir; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 virHostdevReAttachPCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, name, - hostdevs, nhostdevs, oldStateDir); + hostdevs, nhostdevs); } =20 void diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 40c14a5281..91f9112e8b 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -245,13 +245,13 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(void) inactive_count =3D virPCIDeviceListCount(mgr->inactivePCIHostdevs); =20 VIR_TEST_DEBUG("Test 0 hostdevs"); - virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); + virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count); CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count); =20 VIR_TEST_DEBUG("Test >=3D1 unmanaged hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, - hostdevs, nhostdevs, NULL); + hostdevs, nhostdevs); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count - nhostdevs); CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count + nhostd= evs); =20 @@ -329,13 +329,13 @@ testVirHostdevReAttachPCIHostdevs_managed(bool mixed) inactive_count =3D virPCIDeviceListCount(mgr->inactivePCIHostdevs); =20 VIR_TEST_DEBUG("Test 0 hostdevs"); - virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0, NULL); + virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, NULL, 0); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count); CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count); =20 VIR_TEST_DEBUG("Test >=3D1 hostdevs"); virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, - hostdevs, nhostdevs, NULL); + hostdevs, nhostdevs); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count - nhostdevs); /* If testing a mixed roundtrip, devices are added back to the inactive * list as soon as we detach from the guest */ @@ -542,7 +542,7 @@ testNVMeDiskRoundtrip(const void *opaque G_GNUC_UNUSED) /* Don't rely on a state that previous test cases might have * left the manager in. Start with a clean slate. */ virHostdevReAttachPCIDevices(mgr, drv_name, dom_name, - hostdevs, nhostdevs, NULL); + hostdevs, nhostdevs); =20 CHECK_NVME_LIST_COUNT(mgr->activeNVMeHostdevs, 0); CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, 0); --=20 2.29.2 From nobody Mon Apr 29 13:59:25 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=1612160862; cv=none; d=zohomail.com; s=zohoarc; b=KDpqEfT2Qua6PNgSSEqIaldZFUR4XfziSeyx99ApIsZDSBvgzxtK3jGJ8ZkL8aAx2wWIfRTz0pmR6lF49hksBGxgUYg2Vn+CpbWptlQeS8J5NJhyJGHQ0d3ak/e2ABoodQh+ypHqy/Q9HI644CvetzWm7hmA9tB/rNYHxabFnYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160862; 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=92YalUK8Au2chXQHLVV3kuZiChUx+oSVbEJ6MHccSQI=; b=E4umrEED2Cv0xDpBySGUyxP0yIZxfjYykWO2xvkpxBg0Xnj9ZarjtiXuQ8rTrAFIaHBbnWjniOZVXLxQ6vxMnKJAQgIH4bkmkCp1PtmQYcAn7+7CuY5+UdmmbAv/NTXaZTt8K6Lslg/cK+DTIVaztPfQILeXQrJz3mZxUNzak8I= 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 1612160862737443.76771071847224; Sun, 31 Jan 2021 22:27: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-389-I7BOqs2RM8a9zcDSpB7N7A-1; Mon, 01 Feb 2021 01:27:39 -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 6E1EAC7401; Mon, 1 Feb 2021 06:27:33 +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 2CF1D19744; Mon, 1 Feb 2021 06:27: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 09DEB1809C9F; Mon, 1 Feb 2021 06:27:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RRL3025979 for ; Mon, 1 Feb 2021 01:27:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 567AB70476; Mon, 1 Feb 2021 06:27:27 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 221CD7216C for ; Mon, 1 Feb 2021 06:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160861; 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=92YalUK8Au2chXQHLVV3kuZiChUx+oSVbEJ6MHccSQI=; b=BZW+YqhRzBoGl2NquY1dVrhXTl2LXMrpPexcLqCr2MuDO46qAbf7jKqXr6AFxLCYzsV6aP eqIw2rhaLt243I/wtWcLOGTlQx5I78VV7wiJyVX/6R9x6wiGAxgLEMVI6FEkVVqQ8RwzPU fqO6EZeEnKko0zkExhhqfk5JUt76skA= X-MC-Unique: I7BOqs2RM8a9zcDSpB7N7A-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 3/8] conf: replace g_clear_pointer(..., g_hash_table_unref) with virHashFree() Date: Mon, 1 Feb 2021 01:27:15 -0500 Message-Id: <20210201062720.425041-4-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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" virHashFree() just calls g_hash_table_unref(), and it's more common for libvirt code to call virHashFree() rather than the convoluted calling of g_hash_table_unref() via g_clear_pointer(). Since the object containing the hashes is g_freed immediately after the hashes are freed, there is no functional difference. Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/conf/domain_addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 37dad20ade..a8648d5858 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -949,8 +949,8 @@ virDomainPCIAddressSetExtensionFree(virDomainPCIAddress= SetPtr addrs) if (!addrs || !addrs->zpciIds) return; =20 - g_clear_pointer(&addrs->zpciIds->uids, g_hash_table_unref); - g_clear_pointer(&addrs->zpciIds->fids, g_hash_table_unref); + virHashFree(addrs->zpciIds->uids); + virHashFree(addrs->zpciIds->fids); =20 VIR_FREE(addrs->zpciIds); } --=20 2.29.2 From nobody Mon Apr 29 13:59:25 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=1612160880; cv=none; d=zohomail.com; s=zohoarc; b=jJ3vlbj8rqhzX+StIPXYQ2dxSLc1z1Rw2aKBPR3FO8gpzFH6neVKipJcrq9OozrjUwgnEKHa8yhE7M9QXnTOqgD6Fx8Gvqmx/XMid+l25VO3LqVrDcNNz8BKNvyPInkT1LHoFV68VoydLKolCY0dN/ZIu7Bgo/4Xx6jukYq/cWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160880; 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=VQRaQ0z+1cuD+t5lyyEKmQc8pG7NbDV2HSB9YvwebY4=; b=fjHjlpW3uBCvNuRp+PhdlT3+XTczlaUssy+Q25GN8dieTek//Y5yNwvjgC/IRc54jCwNERQRALPKnm3JSM3lBbIe+y4zaGWWX7bSFPzoIvopY7yWp/8zV4wZ6S8C96kmVK9X0MIx4v2rGKtN0meM3Ds5VEdCIJHAed1nboBcLyw= 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 1612160880161378.70118905799393; Sun, 31 Jan 2021 22:28:00 -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-566--gLeQuX_Nu-ZlulT6Jhvdg-1; Mon, 01 Feb 2021 01:27:56 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80024802B46; Mon, 1 Feb 2021 06:27:51 +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 1896F5E1B5; Mon, 1 Feb 2021 06:27:51 +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 D8DB950039; Mon, 1 Feb 2021 06:27:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RRTT025988 for ; Mon, 1 Feb 2021 01:27:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id AC4F370497; Mon, 1 Feb 2021 06:27:27 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7774C70476 for ; Mon, 1 Feb 2021 06:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160879; 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=VQRaQ0z+1cuD+t5lyyEKmQc8pG7NbDV2HSB9YvwebY4=; b=g61o7qUCBvfbfK6Elw0oAiO3Q45orz8PL365gcVCA508HzSVjhY4+J1EyVhyWmWy6kZ1v9 UHlAeu08hOg8KDB9aP9wBrlW6CIhq23lpsQoexDGcrltiE3PKo7pdc3YqZfWnyc4MJfFzQ 1ohny/Yija0V2hNlfpaKiKsVy0E/RX0= X-MC-Unique: -gLeQuX_Nu-ZlulT6Jhvdg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 4/8] conf: fix arg to virDomainPCIAddressSetExtensionFree() Date: Mon, 1 Feb 2021 01:27:16 -0500 Message-Id: <20210201062720.425041-5-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.16 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" This function clears out and frees a virDomainZPCIAddressIds object, so that's that's what it should take as its argument, *not* the pointer to a parent object that contains the object we want to free. Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/conf/domain_addr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index a8648d5858..4ba620086d 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -944,15 +944,15 @@ virDomainPCIAddressReleaseAddr(virDomainPCIAddressSet= Ptr addrs, =20 =20 static void -virDomainPCIAddressSetExtensionFree(virDomainPCIAddressSetPtr addrs) +virDomainPCIAddressSetExtensionFree(virDomainZPCIAddressIdsPtr zpciIds) { - if (!addrs || !addrs->zpciIds) + if (!zpciIds) return; =20 - virHashFree(addrs->zpciIds->uids); - virHashFree(addrs->zpciIds->fids); + virHashFree(zpciIds->uids); + virHashFree(zpciIds->fids); =20 - VIR_FREE(addrs->zpciIds); + VIR_FREE(zpciIds); } =20 =20 @@ -1001,7 +1001,7 @@ virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr = addrs) if (!addrs) return; =20 - virDomainPCIAddressSetExtensionFree(addrs); + virDomainPCIAddressSetExtensionFree(addrs->zpciIds); VIR_FREE(addrs->buses); VIR_FREE(addrs); } --=20 2.29.2 From nobody Mon Apr 29 13:59:25 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=1612160880; cv=none; d=zohomail.com; s=zohoarc; b=MV2wPayElaicrriDY781Q0gxSmdHT0+CbDNjIDGvk+GV7oJtg6wHwgLtZspJRGnkPU5aRwbfyUBT4bdSHalczahEbo0ZsQfrPEX9EqRlxgi/oxoALXHeQUe6zFDJMB1XEP6tCW9WXna7gD/A1x328hC5fhYxXsYMMdseztfsES4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160880; 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=eBWf9W4ohD5kFOgzVV73HAuGrJPnwmkuIWuQnu4czYw=; b=hh78WO6tsX6F1zIbAOcla/HZvQ1e4BU3x6DBFyaFk2XVNmFYQWSdiLb/YgVTDZTLx7uzoaLuLxhElGSJ+3n5770HH75O1kD34xGui7nGVUYyKrPypkuV0aLRcIzjRrv6QobVvZsFmh1wTaodBq4hDwIn4HdgaYkHxpBBJxhalEc= 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 161216088043126.252674235449263; Sun, 31 Jan 2021 22:28:00 -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-281-_ZRD0cCiP9OIYUngiZA6Lw-1; Mon, 01 Feb 2021 01:27:57 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43C65803624; Mon, 1 Feb 2021 06:27:51 +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 1EB0110016F5; Mon, 1 Feb 2021 06:27:51 +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 DCF025003A; Mon, 1 Feb 2021 06:27:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RSpW026012 for ; Mon, 1 Feb 2021 01:27:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0DFBF70497; Mon, 1 Feb 2021 06:27:28 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDA7470476 for ; Mon, 1 Feb 2021 06:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160879; 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=eBWf9W4ohD5kFOgzVV73HAuGrJPnwmkuIWuQnu4czYw=; b=agg/Y2iGoWB6xuAT1+74Sh+sX/OGtWs87rLMHW5524rnex7GdSAh67Pa8+l9iV+4IgekX0 LjpFkZaVDosW0Rie2FKAyYCXbyAMudOKmXEkCv9mQa1ZWZp1M9tLD0r9RZdlcPQfL1RGcU 14IDi+xKuX1IUbWh8TZolHYfhgCOKTk= X-MC-Unique: _ZRD0cCiP9OIYUngiZA6Lw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 5/8] conf: don't bother setting pointers to NULL in vir*Free() functions Date: Mon, 1 Feb 2021 01:27:17 -0500 Message-Id: <20210201062720.425041-6-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.22 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" The memory containing the pointer is going to be freed momentarily anyway. Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 5 ----- src/conf/node_device_conf.c | 1 - 2 files changed, 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c16036f5d8..658f563b36 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1908,7 +1908,6 @@ virDomainVcpuDefFree(virDomainVcpuDefPtr info) return; =20 virBitmapFree(info->cpumask); - info->cpumask =3D NULL; virObjectUnref(info->privateData); VIR_FREE(info); } @@ -2474,7 +2473,6 @@ virDomainNetDefFree(virDomainNetDefPtr def) switch (def->type) { case VIR_DOMAIN_NET_TYPE_VHOSTUSER: virObjectUnref(def->data.vhostuser); - def->data.vhostuser =3D NULL; break; =20 case VIR_DOMAIN_NET_TYPE_VDPA: @@ -2493,7 +2491,6 @@ virDomainNetDefFree(virDomainNetDefPtr def) g_free(def->data.network.name); g_free(def->data.network.portgroup); virDomainActualNetDefFree(def->data.network.actual); - def->data.network.actual =3D NULL; break; =20 case VIR_DOMAIN_NET_TYPE_BRIDGE: @@ -2537,10 +2534,8 @@ virDomainNetDefFree(virDomainNetDefPtr def) =20 g_free(def->filter); virHashFree(def->filterparams); - def->filterparams =3D NULL; =20 virNetDevBandwidthFree(def->bandwidth); - def->bandwidth =3D NULL; virNetDevVlanClear(&def->vlan); =20 virObjectUnref(def->privateData); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 35f34b10e9..b6f73161b5 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2422,7 +2422,6 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) VIR_FREE(data->net.ifname); VIR_FREE(data->net.address); virBitmapFree(data->net.features); - data->net.features =3D NULL; break; case VIR_NODE_DEV_CAP_SCSI_HOST: VIR_FREE(data->scsi_host.wwnn); --=20 2.29.2 From nobody Mon Apr 29 13:59:25 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=1612160943; cv=none; d=zohomail.com; s=zohoarc; b=CWUdqRa1WgfqnbSWstYHyQaMoK5Ij2jA9c58FfTge3u1Pz5ChOVe/FQE/J+b3N1MjSPCanuJOISQhH2ohAtUrWaaezOqTOCqq+qy9ukK0ICYlGUkQrxdElByUjc7H3h2w04SyPr5TTnpCRM2RDlCt2A3Mz4lwLZqVYnit6cf6cA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160943; 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=rH/juWmgcI25WR5uvL0J2aH5QTZshO1gdchPVKTNMCI=; b=RfitHtVcG2R98jUp+cCApQcQNaQ89XyMC4oPHnbzfklosnzVL6+bOHzgxeiLBnqbWb2FyjniuULB3k3bUX0svv2SU//8Ot/z1p+mfq3Dqk9FZvhwqOHBondLpAJRbTsxFHSqc06WZRkw7T8aN2PXrfB7ONTRcmqQOi6xfeCrOi8= 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 1612160943343298.9276140957122; Sun, 31 Jan 2021 22: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-165-hNLcWg8LPOSLf7dJaOsrKg-1; Mon, 01 Feb 2021 01:28:00 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D66FB107ACFB; Mon, 1 Feb 2021 06:27: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 B6A1F6F988; Mon, 1 Feb 2021 06:27:53 +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 80F495003F; Mon, 1 Feb 2021 06:27:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RSKh026025 for ; Mon, 1 Feb 2021 01:27:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 64E2070476; Mon, 1 Feb 2021 06:27:28 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 300EF7216E for ; Mon, 1 Feb 2021 06:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160942; 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=rH/juWmgcI25WR5uvL0J2aH5QTZshO1gdchPVKTNMCI=; b=ZaNXcD8aVo16oupi7aaQPHaq/YhG0e6xFzo6g6Ivn0//dKY71SPMPTmjOabwgrJ8DspvHI Cp86/4mnLVO61ALzBX/OZ6PWfJNaCjZSFaWunFbIff8UA9dUuK6yIP6JcAcQlQaKp6E5ng Jw8Hd8giee6LIMFnGArm4sT6ahVLxXA= X-MC-Unique: hNLcWg8LPOSLf7dJaOsrKg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 6/8] conf: eliminate pointless setting of interface model Date: Mon, 1 Feb 2021 01:27:18 -0500 Message-Id: <20210201062720.425041-7-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.13 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" There is no point in setting the interface model to unknown during virDomainNetDefFree(), since we are about to free the object anyway (and the model isn't used anywhere in the rest of the function). Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 658f563b36..1a163857ca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2468,7 +2468,6 @@ virDomainNetDefFree(virDomainNetDefPtr def) return; =20 VIR_FREE(def->modelstr); - def->model =3D VIR_DOMAIN_NET_MODEL_UNKNOWN; =20 switch (def->type) { case VIR_DOMAIN_NET_TYPE_VHOSTUSER: --=20 2.29.2 From nobody Mon Apr 29 13:59:25 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=1612160887; cv=none; d=zohomail.com; s=zohoarc; b=Xj/TaBo5hp7z8ruTxHKwLtR0qbHA8l6QgHhO/bW1jQqe/pREIA/nZTE7exO66mvxccfQF7rz+P6Fxq8huPq0jmlxqcapaDa2A2ljUp/+GQlrduu3HRnAa/bmSJbdJn1KhFqprEA9aXzsz30D0SAiyFgwR/rbRGAsXLCcGDBCo8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160887; 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=zu7hmENln2I5ClbLXJgfGtJxJYanMc7Er00Spevwy4k=; b=iZbnbcYSUqHsAi28F2hTBJcD1ZvY6KVqvFeGpeTfcq/okPq65ScxCZcx/CRtz3sI06tNtjxBVslCmMnucYA9R2GjCWjAILWBDyh7w3htOvAK01RR2SCvfiFQuLunPqQmJ3j+ZANYAz3qpdSp6R1UTJUPyRvET7t28T+P91ZH+Fo= 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 1612160887177819.4659863875045; Sun, 31 Jan 2021 22:28: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-458-_VNrT0COPpuUc4HvDgB0yw-1; Mon, 01 Feb 2021 01:28:01 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F8071007460; Mon, 1 Feb 2021 06:27:54 +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 5FF806F988; Mon, 1 Feb 2021 06:27:54 +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 298F31809CA7; Mon, 1 Feb 2021 06:27:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RSkw026030 for ; Mon, 1 Feb 2021 01:27:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id BA91670497; Mon, 1 Feb 2021 06:27:28 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8545070476 for ; Mon, 1 Feb 2021 06:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160886; 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=zu7hmENln2I5ClbLXJgfGtJxJYanMc7Er00Spevwy4k=; b=D6/FQaooFtSwHnb/zgUvNThOIUGRcOKSsi3n746BL50AL+oHTRlxOyH+vwd5DhYo2PHFTR dToEppKqK36UIUF97qYZQWD+7cfoolIompxtB8oMPYjctiTRK0Vs33P6U4Q16F+jnUuqu8 Yn+HqcuWuBAQBa/vXE6yWYr/Y9SKDbE= X-MC-Unique: _VNrT0COPpuUc4HvDgB0yw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 7/8] util: rename virStorageEncryptionInfoDefFree() Date: Mon, 1 Feb 2021 01:27:19 -0500 Message-Id: <20210201062720.425041-8-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.13 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" usually a function call vir*Free() will take a single pointer to an object as its argument, and will then free all resources associated with that object, including the object itself. virStorageEnctyptionInfoDefFree() doesn't do that - it frees all the subordinate resources of the ojbect, but doesn't free the object itself; usually a function like that is called vir*Clear(). Let's rename this function to not be misleading. Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- src/conf/storage_encryption_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encrypti= on_conf.c index 34ad5dffeb..6a32df15b7 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -48,7 +48,7 @@ VIR_ENUM_IMPL(virStorageEncryptionFormat, ); =20 static void -virStorageEncryptionInfoDefFree(virStorageEncryptionInfoDefPtr def) +virStorageEncryptionInfoDefClear(virStorageEncryptionInfoDefPtr def) { VIR_FREE(def->cipher_name); VIR_FREE(def->cipher_mode); @@ -77,7 +77,7 @@ virStorageEncryptionFree(virStorageEncryptionPtr enc) =20 for (i =3D 0; i < enc->nsecrets; i++) virStorageEncryptionSecretFree(enc->secrets[i]); - virStorageEncryptionInfoDefFree(&enc->encinfo); + virStorageEncryptionInfoDefClear(&enc->encinfo); VIR_FREE(enc->secrets); VIR_FREE(enc); } --=20 2.29.2 From nobody Mon Apr 29 13:59:25 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=1612160886; cv=none; d=zohomail.com; s=zohoarc; b=KAa3IBCW3QUIa0JV+VfILWR7j5+4DVkKinoYkN8isb60pfTDBPor+L74a/4nJ68IBfOKqJPKlwSX/cq+8UZ16PSkYSIeIK8Q7M/KN51Rga4jKFuawsHJt5GumjQBqHaYOTLkWEDgFSWuWPa1Ez6P8xcJJCqd6qZFvzHS8hArhbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612160886; 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=U/Gp06f2NhdlI99BdD5Ts/FWfx3UVXIl0xkdiJapi4I=; b=nh9gWG+6E2Y725Aq9wukTWRax6l6IxgQdL6jl8zytUOaZw9WL4JcJJbTbLax9piShzfes3fNr+kE2eYJAvbBXv93OieFcbEyFuNLPaglTQoQeALV1oz7J+xiLu0vCSAvEEeD0PWmAagkmXv7taYNuQ/kEWl64dQJSkQuUgmdVsE= 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 1612160886725677.8695614926439; Sun, 31 Jan 2021 22:28:06 -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-55-cFZfHuz6N5-tDQjmSVXOmQ-1; Mon, 01 Feb 2021 01:28:02 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2FE51842143; Mon, 1 Feb 2021 06:27:56 +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 83F256F988; Mon, 1 Feb 2021 06:27:56 +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 4E65B50041; Mon, 1 Feb 2021 06:27:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1116RT9V026035 for ; Mon, 1 Feb 2021 01:27:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3FB2C70497; Mon, 1 Feb 2021 06:27:29 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD31370476 for ; Mon, 1 Feb 2021 06:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612160885; 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=U/Gp06f2NhdlI99BdD5Ts/FWfx3UVXIl0xkdiJapi4I=; b=FJhNHKvYRyoIO+aGwgaCesrWuW7IO8Bk0l2j6YsN9D9z3dcYl1T6acm3UqFzmDp4oDY5ZA ieVzs2s/R6CBLvUtk+pHfzD7RVcD0KHMod70pHyvhrZSmmLGUYD2qGWt2WADWjjVD0Xrof yDR1nzGkLj1KsvaaTGX7LCF+hBjnGgg= X-MC-Unique: cFZfHuz6N5-tDQjmSVXOmQ-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 8/8] conf: replace VIR_FREE() with g_free() in vir*Free() functions Date: Mon, 1 Feb 2021 01:27:20 -0500 Message-Id: <20210201062720.425041-9-laine@redhat.com> In-Reply-To: <20210201062720.425041-1-laine@redhat.com> References: <20210201062720.425041-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.13 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" This patch takes on one set of examples of unnecessary use of VIR_FREE() when g_free() is adequate - it modifies only vir*Free() functions within the conf directory that take a single pointer and free the object pointed to by that argument before returning. The modification is to replace VIR_FREE() with g_free() for the object itself *and* for all subordinate chunks of memory pointed to by that object. (NB: there are other functions that VIR_FREE subordinate memory of objects that end up being freed before return (also sometimes with VIR_FREE); I am purposefully ignoring those to reduce scope and focus on a sub class where the pointlessness is obvious.) Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- NB: After going through the experience a few days ago of needing to more or less manually backport a patch due to a different patch similar to this one touching the one function relevant to the desired patch as well as many dozens of other functions (thus making it impractical to backport that patch as a prerequisite), I contemplated splitting this patch up all the way to 1 patch for every function. That seemed extreme though, so I've left it as is. An alternative, of course, is to just do nothing and leave everything as VIR_FREE() (and I know there is sentiment in that direction, a bit from me even :-P). I wonder though if we'll ever live up to the goals listed in docs/glib-adoption.txt... src/conf/capabilities.c | 8 +- src/conf/cpu_conf.c | 8 +- src/conf/device_conf.c | 2 +- src/conf/domain_addr.c | 22 +- src/conf/domain_capabilities.c | 6 +- src/conf/domain_conf.c | 298 +++++++++++++------------- src/conf/interface_conf.c | 32 +-- src/conf/network_conf.c | 18 +- src/conf/node_device_conf.c | 104 ++++----- src/conf/nwfilter_conf.c | 22 +- src/conf/nwfilter_params.c | 16 +- src/conf/object_event.c | 12 +- src/conf/secret_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 22 +- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_conf.c | 26 +-- src/conf/virdomaincheckpointobjlist.c | 2 +- src/conf/virdomainmomentobjlist.c | 4 +- src/conf/virdomainsnapshotobjlist.c | 2 +- src/conf/virnetworkportdef.c | 12 +- src/conf/virnwfilterbindingdef.c | 10 +- src/conf/virnwfilterobj.c | 6 +- 23 files changed, 322 insertions(+), 322 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 425f34113a..954cdd2c8c 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -207,7 +207,7 @@ virCapsHostMemBWNodeFree(virCapsHostMemBWNodePtr ptr) return; =20 virBitmapFree(ptr->cpus); - VIR_FREE(ptr); + g_free(ptr); } =20 static void @@ -1757,9 +1757,9 @@ virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr) =20 virBitmapFree(ptr->cpus); for (i =3D 0; i < ptr->ncontrols; i++) - VIR_FREE(ptr->controls[i]); - VIR_FREE(ptr->controls); - VIR_FREE(ptr); + g_free(ptr->controls[i]); + g_free(ptr->controls); + g_free(ptr); } =20 =20 diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index a2d88ba818..f98b0a0eb3 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -127,9 +127,9 @@ virCPUDefFree(virCPUDefPtr def) =20 if (g_atomic_int_dec_and_test(&def->refs)) { virCPUDefFreeModel(def); - VIR_FREE(def->cache); - VIR_FREE(def->tsc); - VIR_FREE(def); + g_free(def->cache); + g_free(def->tsc); + g_free(def); } } =20 @@ -1199,5 +1199,5 @@ virCPUDefListFree(virCPUDefPtr *cpus) for (cpu =3D cpus; *cpu !=3D NULL; cpu++) virCPUDefFree(*cpu); =20 - VIR_FREE(cpus); + g_free(cpus); } diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 87bf32bbc6..714ac50762 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -99,7 +99,7 @@ virDomainDeviceInfoFree(virDomainDeviceInfoPtr info) { if (info) { virDomainDeviceInfoClear(info); - VIR_FREE(info); + g_free(info); } } =20 diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 4ba620086d..bbfee6918e 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -952,7 +952,7 @@ virDomainPCIAddressSetExtensionFree(virDomainZPCIAddres= sIdsPtr zpciIds) virHashFree(zpciIds->uids); virHashFree(zpciIds->fids); =20 - VIR_FREE(zpciIds); + g_free(zpciIds); } =20 =20 @@ -1002,8 +1002,8 @@ virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr = addrs) return; =20 virDomainPCIAddressSetExtensionFree(addrs->zpciIds); - VIR_FREE(addrs->buses); - VIR_FREE(addrs); + g_free(addrs->buses); + g_free(addrs); } =20 =20 @@ -1379,7 +1379,7 @@ void virDomainCCWAddressSetFree(virDomainCCWAddressSe= tPtr addrs) return; =20 virHashFree(addrs->defined); - VIR_FREE(addrs); + g_free(addrs); } =20 static virDomainCCWAddressSetPtr @@ -1451,7 +1451,7 @@ virDomainVirtioSerialControllerFree(virDomainVirtioSe= rialControllerPtr cont) { if (cont) { virBitmapFree(cont->ports); - VIR_FREE(cont); + g_free(cont); } } =20 @@ -1558,8 +1558,8 @@ virDomainVirtioSerialAddrSetFree(virDomainVirtioSeria= lAddrSetPtr addrs) if (addrs) { for (i =3D 0; i < addrs->ncontrollers; i++) virDomainVirtioSerialControllerFree(addrs->controllers[i]); - VIR_FREE(addrs->controllers); - VIR_FREE(addrs); + g_free(addrs->controllers); + g_free(addrs); } } =20 @@ -1886,9 +1886,9 @@ virDomainUSBAddressHubFree(virDomainUSBAddressHubPtr = hub) =20 for (i =3D 0; i < hub->nports; i++) virDomainUSBAddressHubFree(hub->ports[i]); - VIR_FREE(hub->ports); + g_free(hub->ports); virBitmapFree(hub->portmap); - VIR_FREE(hub); + g_free(hub); } =20 =20 @@ -1902,8 +1902,8 @@ virDomainUSBAddressSetFree(virDomainUSBAddressSetPtr = addrs) =20 for (i =3D 0; i < addrs->nbuses; i++) virDomainUSBAddressHubFree(addrs->buses[i]); - VIR_FREE(addrs->buses); - VIR_FREE(addrs); + g_free(addrs->buses); + g_free(addrs); } =20 =20 diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 8130311590..08789aeb31 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -85,9 +85,9 @@ virSEVCapabilitiesFree(virSEVCapability *cap) if (!cap) return; =20 - VIR_FREE(cap->pdh); - VIR_FREE(cap->cert_chain); - VIR_FREE(cap); + g_free(cap->pdh); + g_free(cap->cert_chain); + g_free(cap); } =20 =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1a163857ca..97fa841bff 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1806,30 +1806,30 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefP= tr def) =20 switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - VIR_FREE(def->data.vnc.keymap); + g_free(def->data.vnc.keymap); virDomainGraphicsAuthDefClear(&def->data.vnc.auth); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - VIR_FREE(def->data.sdl.display); - VIR_FREE(def->data.sdl.xauth); + g_free(def->data.sdl.display); + g_free(def->data.sdl.xauth); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_RDP: break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - VIR_FREE(def->data.desktop.display); + g_free(def->data.desktop.display); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: - VIR_FREE(def->data.spice.rendernode); - VIR_FREE(def->data.spice.keymap); + g_free(def->data.spice.rendernode); + g_free(def->data.spice.keymap); virDomainGraphicsAuthDefClear(&def->data.spice.auth); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: - VIR_FREE(def->data.egl_headless.rendernode); + g_free(def->data.egl_headless.rendernode); break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_LAST: @@ -1838,10 +1838,10 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefP= tr def) =20 for (i =3D 0; i < def->nListens; i++) virDomainGraphicsListenDefClear(&def->listens[i]); - VIR_FREE(def->listens); + g_free(def->listens); =20 virObjectUnref(def->privateData); - VIR_FREE(def); + g_free(def); } =20 const char *virDomainInputDefGetPath(virDomainInputDefPtr input) @@ -1865,9 +1865,9 @@ void virDomainInputDefFree(virDomainInputDefPtr def) return; =20 virDomainDeviceInfoClear(&def->info); - VIR_FREE(def->source.evdev); - VIR_FREE(def->virtio); - VIR_FREE(def); + g_free(def->source.evdev); + g_free(def->virtio); + g_free(def); } =20 void virDomainLeaseDefFree(virDomainLeaseDefPtr def) @@ -1875,11 +1875,11 @@ void virDomainLeaseDefFree(virDomainLeaseDefPtr def) if (!def) return; =20 - VIR_FREE(def->lockspace); - VIR_FREE(def->key); - VIR_FREE(def->path); + g_free(def->lockspace); + g_free(def->key); + g_free(def->path); =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -1909,7 +1909,7 @@ virDomainVcpuDefFree(virDomainVcpuDefPtr info) =20 virBitmapFree(info->cpumask); virObjectUnref(info->privateData); - VIR_FREE(info); + g_free(info); } =20 =20 @@ -2184,20 +2184,20 @@ virDomainDiskDefFree(virDomainDiskDefPtr def) return; =20 virObjectUnref(def->src); - VIR_FREE(def->serial); - VIR_FREE(def->dst); + g_free(def->serial); + g_free(def->dst); virObjectUnref(def->mirror); - VIR_FREE(def->wwn); - VIR_FREE(def->driverName); - VIR_FREE(def->vendor); - VIR_FREE(def->product); - VIR_FREE(def->domain_name); - VIR_FREE(def->blkdeviotune.group_name); - VIR_FREE(def->virtio); + g_free(def->wwn); + g_free(def->driverName); + g_free(def->vendor); + g_free(def->product); + g_free(def->domain_name); + g_free(def->blkdeviotune.group_name); + g_free(def->virtio); virDomainDeviceInfoClear(&def->info); virObjectUnref(def->privateData); =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -2327,9 +2327,9 @@ void virDomainControllerDefFree(virDomainControllerDe= fPtr def) return; =20 virDomainDeviceInfoClear(&def->info); - VIR_FREE(def->virtio); + g_free(def->virtio); =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -2391,13 +2391,13 @@ void virDomainFSDefFree(virDomainFSDefPtr def) return; =20 virObjectUnref(def->src); - VIR_FREE(def->dst); + g_free(def->dst); virDomainDeviceInfoClear(&def->info); - VIR_FREE(def->virtio); + g_free(def->virtio); virObjectUnref(def->privateData); - VIR_FREE(def->binary); + g_free(def->binary); =20 - VIR_FREE(def); + g_free(def); } =20 void @@ -2409,10 +2409,10 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr = def) switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: - VIR_FREE(def->data.bridge.brname); + g_free(def->data.bridge.brname); break; case VIR_DOMAIN_NET_TYPE_DIRECT: - VIR_FREE(def->data.direct.linkdev); + g_free(def->data.direct.linkdev); break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: virDomainHostdevDefClear(&def->data.hostdev.def); @@ -2421,10 +2421,10 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr = def) break; } =20 - VIR_FREE(def->virtPortProfile); + g_free(def->virtPortProfile); virNetDevBandwidthFree(def->bandwidth); virNetDevVlanClear(&def->vlan); - VIR_FREE(def); + g_free(def); } =20 =20 @@ -2456,8 +2456,8 @@ virDomainVsockDefFree(virDomainVsockDefPtr vsock) =20 virObjectUnref(vsock->privateData); virDomainDeviceInfoClear(&vsock->info); - VIR_FREE(vsock->virtio); - VIR_FREE(vsock); + g_free(vsock->virtio); + g_free(vsock); } =20 =20 @@ -2467,7 +2467,7 @@ virDomainNetDefFree(virDomainNetDefPtr def) if (!def) return; =20 - VIR_FREE(def->modelstr); + g_free(def->modelstr); =20 switch (def->type) { case VIR_DOMAIN_NET_TYPE_VHOSTUSER: @@ -2475,7 +2475,7 @@ virDomainNetDefFree(virDomainNetDefPtr def) break; =20 case VIR_DOMAIN_NET_TYPE_VDPA: - VIR_FREE(def->data.vdpa.devicepath); + g_free(def->data.vdpa.devicepath); break; =20 case VIR_DOMAIN_NET_TYPE_SERVER: @@ -2764,12 +2764,12 @@ void virDomainChrDefFree(virDomainChrDefPtr def) case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: switch (def->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: - VIR_FREE(def->target.addr); + g_free(def->target.addr); break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - VIR_FREE(def->target.name); + g_free(def->target.name); break; } break; @@ -2781,7 +2781,7 @@ void virDomainChrDefFree(virDomainChrDefPtr def) virObjectUnref(def->source); virDomainDeviceInfoClear(&def->info); =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def) @@ -2796,8 +2796,8 @@ void virDomainSmartcardDefFree(virDomainSmartcardDefP= tr def) =20 case VIR_DOMAIN_SMARTCARD_TYPE_HOST_CERTIFICATES: for (i =3D 0; i < VIR_DOMAIN_SMARTCARD_NUM_CERTIFICATES; i++) - VIR_FREE(def->data.cert.file[i]); - VIR_FREE(def->data.cert.database); + g_free(def->data.cert.file[i]); + g_free(def->data.cert.database); break; =20 case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: @@ -2810,7 +2810,7 @@ void virDomainSmartcardDefFree(virDomainSmartcardDefP= tr def) =20 virDomainDeviceInfoClear(&def->info); =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def) @@ -2818,7 +2818,7 @@ void virDomainSoundCodecDefFree(virDomainSoundCodecDe= fPtr def) if (!def) return; =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainSoundDefFree(virDomainSoundDefPtr def) @@ -2832,9 +2832,9 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def) =20 for (i =3D 0; i < def->ncodecs; i++) virDomainSoundCodecDefFree(def->codecs[i]); - VIR_FREE(def->codecs); + g_free(def->codecs); =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainAudioDefFree(virDomainAudioDefPtr def) @@ -2844,15 +2844,15 @@ void virDomainAudioDefFree(virDomainAudioDefPtr def) =20 switch ((virDomainAudioType) def->type) { case VIR_DOMAIN_AUDIO_TYPE_OSS: - VIR_FREE(def->backend.oss.inputDev); - VIR_FREE(def->backend.oss.outputDev); + g_free(def->backend.oss.inputDev); + g_free(def->backend.oss.outputDev); break; =20 case VIR_DOMAIN_AUDIO_TYPE_LAST: break; } =20 - VIR_FREE(def); + g_free(def); } =20 virDomainSoundDefPtr @@ -2869,9 +2869,9 @@ void virDomainMemballoonDefFree(virDomainMemballoonDe= fPtr def) return; =20 virDomainDeviceInfoClear(&def->info); - VIR_FREE(def->virtio); + g_free(def->virtio); =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) @@ -2881,7 +2881,7 @@ void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) =20 virDomainDeviceInfoClear(&def->info); =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) @@ -2891,7 +2891,7 @@ void virDomainWatchdogDefFree(virDomainWatchdogDefPtr= def) =20 virDomainDeviceInfoClear(&def->info); =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainShmemDefFree(virDomainShmemDefPtr def) @@ -2901,8 +2901,8 @@ void virDomainShmemDefFree(virDomainShmemDefPtr def) =20 virDomainDeviceInfoClear(&def->info); virDomainChrSourceDefClear(&def->server.chr); - VIR_FREE(def->name); - VIR_FREE(def); + g_free(def->name); + g_free(def); } =20 =20 @@ -2952,7 +2952,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def) return; =20 virDomainVideoDefClear(def); - VIR_FREE(def); + g_free(def); } =20 =20 @@ -3044,15 +3044,15 @@ void virDomainTPMDefFree(virDomainTPMDefPtr def) break; case VIR_DOMAIN_TPM_TYPE_EMULATOR: virDomainChrSourceDefClear(&def->data.emulator.source); - VIR_FREE(def->data.emulator.storagepath); - VIR_FREE(def->data.emulator.logfile); + g_free(def->data.emulator.storagepath); + g_free(def->data.emulator.logfile); break; case VIR_DOMAIN_TPM_TYPE_LAST: break; } =20 virDomainDeviceInfoClear(&def->info); - VIR_FREE(def); + g_free(def); } =20 void virDomainHostdevDefFree(virDomainHostdevDefPtr def) @@ -3067,7 +3067,7 @@ void virDomainHostdevDefFree(virDomainHostdevDefPtr d= ef) * the memory. */ if (!def->parentnet) - VIR_FREE(def); + g_free(def); } =20 void virDomainHubDefFree(virDomainHubDefPtr def) @@ -3076,7 +3076,7 @@ void virDomainHubDefFree(virDomainHubDefPtr def) return; =20 virDomainDeviceInfoClear(&def->info); - VIR_FREE(def); + g_free(def); } =20 void virDomainRedirdevDefFree(virDomainRedirdevDefPtr def) @@ -3087,7 +3087,7 @@ void virDomainRedirdevDefFree(virDomainRedirdevDefPtr= def) virObjectUnref(def->source); virDomainDeviceInfoClear(&def->info); =20 - VIR_FREE(def); + g_free(def); } =20 void virDomainRedirFilterDefFree(virDomainRedirFilterDefPtr def) @@ -3098,10 +3098,10 @@ void virDomainRedirFilterDefFree(virDomainRedirFilt= erDefPtr def) return; =20 for (i =3D 0; i < def->nusbdevs; i++) - VIR_FREE(def->usbdevs[i]); + g_free(def->usbdevs[i]); =20 - VIR_FREE(def->usbdevs); - VIR_FREE(def); + g_free(def->usbdevs); + g_free(def); } =20 void virDomainMemoryDefFree(virDomainMemoryDefPtr def) @@ -3109,11 +3109,11 @@ void virDomainMemoryDefFree(virDomainMemoryDefPtr d= ef) if (!def) return; =20 - VIR_FREE(def->nvdimmPath); + g_free(def->nvdimmPath); virBitmapFree(def->sourceNodes); - VIR_FREE(def->uuid); + g_free(def->uuid); virDomainDeviceInfoClear(&def->info); - VIR_FREE(def); + g_free(def); } =20 void virDomainDeviceDefFree(virDomainDeviceDefPtr def) @@ -3189,7 +3189,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) virDomainMemoryDefFree(def->data.memory); break; case VIR_DOMAIN_DEVICE_IOMMU: - VIR_FREE(def->data.iommu); + g_free(def->data.iommu); break; case VIR_DOMAIN_DEVICE_VSOCK: virDomainVsockDefFree(def->data.vsock); @@ -3202,7 +3202,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) break; } =20 - VIR_FREE(def); + g_free(def); } =20 static void @@ -3238,7 +3238,7 @@ virDomainIOThreadIDDefFree(virDomainIOThreadIDDefPtr = def) if (!def) return; virBitmapFree(def->cpumask); - VIR_FREE(def); + g_free(def); } =20 =20 @@ -3254,7 +3254,7 @@ virDomainIOThreadIDDefArrayFree(virDomainIOThreadIDDe= fPtr *def, for (i =3D 0; i < nids; i++) virDomainIOThreadIDDefFree(def[i]); =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -3311,8 +3311,8 @@ virDomainResourceDefFree(virDomainResourceDefPtr reso= urce) if (!resource) return; =20 - VIR_FREE(resource->partition); - VIR_FREE(resource); + g_free(resource->partition); + g_free(resource); } =20 void @@ -3322,7 +3322,7 @@ virDomainPanicDefFree(virDomainPanicDefPtr panic) return; =20 virDomainDeviceInfoClear(&panic->info); - VIR_FREE(panic); + g_free(panic); } =20 void @@ -3331,10 +3331,10 @@ virDomainLoaderDefFree(virDomainLoaderDefPtr loader) if (!loader) return; =20 - VIR_FREE(loader->path); - VIR_FREE(loader->nvram); - VIR_FREE(loader->templt); - VIR_FREE(loader); + g_free(loader->path); + g_free(loader->nvram); + g_free(loader->templt); + g_free(loader); } =20 =20 @@ -3346,7 +3346,7 @@ virDomainResctrlMonDefFree(virDomainResctrlMonDefPtr = domresmon) =20 virBitmapFree(domresmon->vcpus); virObjectUnref(domresmon->instance); - VIR_FREE(domresmon); + g_free(domresmon); } =20 =20 @@ -3363,8 +3363,8 @@ virDomainResctrlDefFree(virDomainResctrlDefPtr resctr= l) =20 virObjectUnref(resctrl->alloc); virBitmapFree(resctrl->vcpus); - VIR_FREE(resctrl->monitors); - VIR_FREE(resctrl); + g_free(resctrl->monitors); + g_free(resctrl); } =20 =20 @@ -3374,10 +3374,10 @@ virDomainSEVDefFree(virDomainSEVDefPtr def) if (!def) return; =20 - VIR_FREE(def->dh_cert); - VIR_FREE(def->session); + g_free(def->dh_cert); + g_free(def->session); =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -3392,7 +3392,7 @@ void virDomainDefFree(virDomainDefPtr def) =20 for (i =3D 0; i < def->maxvcpus; i++) virDomainVcpuDefFree(def->vcpus[i]); - VIR_FREE(def->vcpus); + g_free(def->vcpus); =20 /* hostdevs must be freed before nets (or any future "intelligent * hostdevs") because the pointer to the hostdev is really @@ -3402,133 +3402,133 @@ void virDomainDefFree(virDomainDefPtr def) */ for (i =3D 0; i < def->nhostdevs; i++) virDomainHostdevDefFree(def->hostdevs[i]); - VIR_FREE(def->hostdevs); + g_free(def->hostdevs); =20 for (i =3D 0; i < def->nleases; i++) virDomainLeaseDefFree(def->leases[i]); - VIR_FREE(def->leases); + g_free(def->leases); =20 for (i =3D 0; i < def->ngraphics; i++) virDomainGraphicsDefFree(def->graphics[i]); - VIR_FREE(def->graphics); + g_free(def->graphics); =20 for (i =3D 0; i < def->ninputs; i++) virDomainInputDefFree(def->inputs[i]); - VIR_FREE(def->inputs); + g_free(def->inputs); =20 for (i =3D 0; i < def->ndisks; i++) virDomainDiskDefFree(def->disks[i]); - VIR_FREE(def->disks); + g_free(def->disks); =20 for (i =3D 0; i < def->ncontrollers; i++) virDomainControllerDefFree(def->controllers[i]); - VIR_FREE(def->controllers); + g_free(def->controllers); =20 for (i =3D 0; i < def->nfss; i++) virDomainFSDefFree(def->fss[i]); - VIR_FREE(def->fss); + g_free(def->fss); =20 for (i =3D 0; i < def->nnets; i++) virDomainNetDefFree(def->nets[i]); - VIR_FREE(def->nets); + g_free(def->nets); =20 for (i =3D 0; i < def->nsmartcards; i++) virDomainSmartcardDefFree(def->smartcards[i]); - VIR_FREE(def->smartcards); + g_free(def->smartcards); =20 for (i =3D 0; i < def->nserials; i++) virDomainChrDefFree(def->serials[i]); - VIR_FREE(def->serials); + g_free(def->serials); =20 for (i =3D 0; i < def->nparallels; i++) virDomainChrDefFree(def->parallels[i]); - VIR_FREE(def->parallels); + g_free(def->parallels); =20 for (i =3D 0; i < def->nchannels; i++) virDomainChrDefFree(def->channels[i]); - VIR_FREE(def->channels); + g_free(def->channels); =20 for (i =3D 0; i < def->nconsoles; i++) virDomainChrDefFree(def->consoles[i]); - VIR_FREE(def->consoles); + g_free(def->consoles); =20 for (i =3D 0; i < def->nsounds; i++) virDomainSoundDefFree(def->sounds[i]); - VIR_FREE(def->sounds); + g_free(def->sounds); =20 for (i =3D 0; i < def->naudios; i++) virDomainAudioDefFree(def->audios[i]); - VIR_FREE(def->audios); + g_free(def->audios); =20 for (i =3D 0; i < def->nvideos; i++) virDomainVideoDefFree(def->videos[i]); - VIR_FREE(def->videos); + g_free(def->videos); =20 for (i =3D 0; i < def->nhubs; i++) virDomainHubDefFree(def->hubs[i]); - VIR_FREE(def->hubs); + g_free(def->hubs); =20 for (i =3D 0; i < def->nredirdevs; i++) virDomainRedirdevDefFree(def->redirdevs[i]); - VIR_FREE(def->redirdevs); + g_free(def->redirdevs); =20 for (i =3D 0; i < def->nrngs; i++) virDomainRNGDefFree(def->rngs[i]); - VIR_FREE(def->rngs); + g_free(def->rngs); =20 for (i =3D 0; i < def->nmems; i++) virDomainMemoryDefFree(def->mems[i]); - VIR_FREE(def->mems); + g_free(def->mems); =20 for (i =3D 0; i < def->ntpms; i++) virDomainTPMDefFree(def->tpms[i]); - VIR_FREE(def->tpms); + g_free(def->tpms); =20 for (i =3D 0; i < def->npanics; i++) virDomainPanicDefFree(def->panics[i]); - VIR_FREE(def->panics); + g_free(def->panics); =20 - VIR_FREE(def->iommu); + g_free(def->iommu); =20 - VIR_FREE(def->idmap.uidmap); - VIR_FREE(def->idmap.gidmap); + g_free(def->idmap.uidmap); + g_free(def->idmap.gidmap); =20 - VIR_FREE(def->os.machine); - VIR_FREE(def->os.init); + g_free(def->os.machine); + g_free(def->os.init); for (i =3D 0; def->os.initargv && def->os.initargv[i]; i++) - VIR_FREE(def->os.initargv[i]); - VIR_FREE(def->os.initargv); + g_free(def->os.initargv[i]); + g_free(def->os.initargv); for (i =3D 0; def->os.initenv && def->os.initenv[i]; i++) { - VIR_FREE(def->os.initenv[i]->name); - VIR_FREE(def->os.initenv[i]->value); - VIR_FREE(def->os.initenv[i]); - } - VIR_FREE(def->os.initdir); - VIR_FREE(def->os.inituser); - VIR_FREE(def->os.initgroup); - VIR_FREE(def->os.initenv); - VIR_FREE(def->os.kernel); - VIR_FREE(def->os.initrd); - VIR_FREE(def->os.cmdline); - VIR_FREE(def->os.dtb); - VIR_FREE(def->os.root); - VIR_FREE(def->os.slic_table); + g_free(def->os.initenv[i]->name); + g_free(def->os.initenv[i]->value); + g_free(def->os.initenv[i]); + } + g_free(def->os.initdir); + g_free(def->os.inituser); + g_free(def->os.initgroup); + g_free(def->os.initenv); + g_free(def->os.kernel); + g_free(def->os.initrd); + g_free(def->os.cmdline); + g_free(def->os.dtb); + g_free(def->os.root); + g_free(def->os.slic_table); virDomainLoaderDefFree(def->os.loader); - VIR_FREE(def->os.bootloader); - VIR_FREE(def->os.bootloaderArgs); + g_free(def->os.bootloader); + g_free(def->os.bootloaderArgs); =20 virDomainClockDefClear(&def->clock); =20 - VIR_FREE(def->name); + g_free(def->name); virBitmapFree(def->cpumask); - VIR_FREE(def->emulator); - VIR_FREE(def->description); - VIR_FREE(def->title); - VIR_FREE(def->hyperv_vendor_id); + g_free(def->emulator); + g_free(def->description); + g_free(def->title); + g_free(def->hyperv_vendor_id); =20 virBlkioDeviceArrayClear(def->blkio.devices, def->blkio.ndevices); - VIR_FREE(def->blkio.devices); + g_free(def->blkio.devices); =20 virDomainWatchdogDefFree(def->watchdog); =20 @@ -3538,36 +3538,36 @@ void virDomainDefFree(virDomainDefPtr def) =20 for (i =3D 0; i < def->mem.nhugepages; i++) virBitmapFree(def->mem.hugepages[i].nodemask); - VIR_FREE(def->mem.hugepages); + g_free(def->mem.hugepages); =20 for (i =3D 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); - VIR_FREE(def->seclabels); + g_free(def->seclabels); =20 virCPUDefFree(def->cpu); =20 virDomainIOThreadIDDefArrayFree(def->iothreadids, def->niothreadids); =20 virBitmapFree(def->cputune.emulatorpin); - VIR_FREE(def->cputune.emulatorsched); + g_free(def->cputune.emulatorsched); =20 virDomainNumaFree(def->numa); =20 for (i =3D 0; i < def->nsysinfo; i++) virSysinfoDefFree(def->sysinfo[i]); - VIR_FREE(def->sysinfo); + g_free(def->sysinfo); =20 virDomainRedirFilterDefFree(def->redirfilter); =20 for (i =3D 0; i < def->nshmems; i++) virDomainShmemDefFree(def->shmems[i]); - VIR_FREE(def->shmems); + g_free(def->shmems); =20 for (i =3D 0; i < def->nresctrls; i++) virDomainResctrlDefFree(def->resctrls[i]); - VIR_FREE(def->resctrls); + g_free(def->resctrls); =20 - VIR_FREE(def->keywrap); + g_free(def->keywrap); =20 if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); @@ -3576,7 +3576,7 @@ void virDomainDefFree(virDomainDefPtr def) =20 xmlFreeNode(def->metadata); =20 - VIR_FREE(def); + g_free(def); } =20 static void virDomainObjDispose(void *obj) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 7bb5ec4deb..3cd8fcee94 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -49,8 +49,8 @@ virInterfaceIPDefFree(virInterfaceIPDefPtr def) { if (def =3D=3D NULL) return; - VIR_FREE(def->address); - VIR_FREE(def); + g_free(def->address); + g_free(def); } =20 =20 @@ -63,10 +63,10 @@ virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr = def) return; for (i =3D 0; i < def->nips; i++) virInterfaceIPDefFree(def->ips[i]); - VIR_FREE(def->ips); - VIR_FREE(def->family); - VIR_FREE(def->gateway); - VIR_FREE(def); + g_free(def->ips); + g_free(def->family); + g_free(def->gateway); + g_free(def); } =20 =20 @@ -79,39 +79,39 @@ virInterfaceDefFree(virInterfaceDefPtr def) if (def =3D=3D NULL) return; =20 - VIR_FREE(def->name); - VIR_FREE(def->mac); + g_free(def->name); + g_free(def->mac); =20 switch (def->type) { case VIR_INTERFACE_TYPE_BRIDGE: - VIR_FREE(def->data.bridge.delay); + g_free(def->data.bridge.delay); for (i =3D 0; i < def->data.bridge.nbItf; i++) { if (def->data.bridge.itf[i] =3D=3D NULL) break; /* to cope with half parsed data on errors */ virInterfaceDefFree(def->data.bridge.itf[i]); } - VIR_FREE(def->data.bridge.itf); + g_free(def->data.bridge.itf); break; case VIR_INTERFACE_TYPE_BOND: - VIR_FREE(def->data.bond.target); + g_free(def->data.bond.target); for (i =3D 0; i < def->data.bond.nbItf; i++) { if (def->data.bond.itf[i] =3D=3D NULL) break; /* to cope with half parsed data on errors */ virInterfaceDefFree(def->data.bond.itf[i]); } - VIR_FREE(def->data.bond.itf); + g_free(def->data.bond.itf); break; case VIR_INTERFACE_TYPE_VLAN: - VIR_FREE(def->data.vlan.tag); - VIR_FREE(def->data.vlan.dev_name); + g_free(def->data.vlan.tag); + g_free(def->data.vlan.dev_name); break; } =20 /* free all protos */ for (pp =3D 0; pp < def->nprotos; pp++) virInterfaceProtocolDefFree(def->protos[pp]); - VIR_FREE(def->protos); - VIR_FREE(def); + g_free(def->protos); + g_free(def); } =20 =20 diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index ff7a56f4f4..f32710b781 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -258,28 +258,28 @@ virNetworkDefFree(virNetworkDefPtr def) if (!def) return; =20 - VIR_FREE(def->name); - VIR_FREE(def->bridge); - VIR_FREE(def->bridgeZone); - VIR_FREE(def->domain); + g_free(def->name); + g_free(def->bridge); + g_free(def->bridgeZone); + g_free(def->domain); =20 virNetworkForwardDefClear(&def->forward); =20 for (i =3D 0; i < def->nips && def->ips; i++) virNetworkIPDefClear(&def->ips[i]); - VIR_FREE(def->ips); + g_free(def->ips); =20 for (i =3D 0; i < def->nroutes && def->routes; i++) virNetDevIPRouteFree(def->routes[i]); - VIR_FREE(def->routes); + g_free(def->routes); =20 for (i =3D 0; i < def->nPortGroups && def->portGroups; i++) virPortGroupDefClear(&def->portGroups[i]); - VIR_FREE(def->portGroups); + g_free(def->portGroups); =20 virNetworkDNSDefClear(&def->dns); =20 - VIR_FREE(def->virtPortProfile); + g_free(def->virtPortProfile); =20 virNetDevBandwidthFree(def->bandwidth); virNetDevVlanClear(&def->vlan); @@ -288,7 +288,7 @@ virNetworkDefFree(virNetworkDefPtr def) =20 if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); - VIR_FREE(def); + g_free(def); } =20 =20 diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index b6f73161b5..1093a461af 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -108,15 +108,15 @@ virNodeDeviceDefFree(virNodeDeviceDefPtr def) if (!def) return; =20 - VIR_FREE(def->name); - VIR_FREE(def->parent); - VIR_FREE(def->parent_wwnn); - VIR_FREE(def->parent_wwpn); - VIR_FREE(def->parent_fabric_wwn); - VIR_FREE(def->driver); - VIR_FREE(def->sysfs_path); - VIR_FREE(def->parent_sysfs_path); - VIR_FREE(def->devnode); + g_free(def->name); + g_free(def->parent); + g_free(def->parent_wwnn); + g_free(def->parent_wwpn); + g_free(def->parent_fabric_wwn); + g_free(def->driver); + g_free(def->sysfs_path); + g_free(def->parent_sysfs_path); + g_free(def->devnode); g_strfreev(def->devlinks); =20 caps =3D def->caps; @@ -126,7 +126,7 @@ virNodeDeviceDefFree(virNodeDeviceDefPtr def) caps =3D next; } =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -2388,83 +2388,83 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) =20 switch (caps->data.type) { case VIR_NODE_DEV_CAP_SYSTEM: - VIR_FREE(data->system.product_name); - VIR_FREE(data->system.hardware.vendor_name); - VIR_FREE(data->system.hardware.version); - VIR_FREE(data->system.hardware.serial); - VIR_FREE(data->system.firmware.vendor_name); - VIR_FREE(data->system.firmware.version); - VIR_FREE(data->system.firmware.release_date); + g_free(data->system.product_name); + g_free(data->system.hardware.vendor_name); + g_free(data->system.hardware.version); + g_free(data->system.hardware.serial); + g_free(data->system.firmware.vendor_name); + g_free(data->system.firmware.version); + g_free(data->system.firmware.release_date); break; case VIR_NODE_DEV_CAP_PCI_DEV: - VIR_FREE(data->pci_dev.product_name); - VIR_FREE(data->pci_dev.vendor_name); - VIR_FREE(data->pci_dev.physical_function); + g_free(data->pci_dev.product_name); + g_free(data->pci_dev.vendor_name); + g_free(data->pci_dev.physical_function); for (i =3D 0; i < data->pci_dev.num_virtual_functions; i++) - VIR_FREE(data->pci_dev.virtual_functions[i]); - VIR_FREE(data->pci_dev.virtual_functions); + g_free(data->pci_dev.virtual_functions[i]); + g_free(data->pci_dev.virtual_functions); for (i =3D 0; i < data->pci_dev.nIommuGroupDevices; i++) - VIR_FREE(data->pci_dev.iommuGroupDevices[i]); - VIR_FREE(data->pci_dev.iommuGroupDevices); + g_free(data->pci_dev.iommuGroupDevices[i]); + g_free(data->pci_dev.iommuGroupDevices); virPCIEDeviceInfoFree(data->pci_dev.pci_express); for (i =3D 0; i < data->pci_dev.nmdev_types; i++) virMediatedDeviceTypeFree(data->pci_dev.mdev_types[i]); - VIR_FREE(data->pci_dev.mdev_types); + g_free(data->pci_dev.mdev_types); break; case VIR_NODE_DEV_CAP_USB_DEV: - VIR_FREE(data->usb_dev.product_name); - VIR_FREE(data->usb_dev.vendor_name); + g_free(data->usb_dev.product_name); + g_free(data->usb_dev.vendor_name); break; case VIR_NODE_DEV_CAP_USB_INTERFACE: - VIR_FREE(data->usb_if.description); + g_free(data->usb_if.description); break; case VIR_NODE_DEV_CAP_NET: - VIR_FREE(data->net.ifname); - VIR_FREE(data->net.address); + g_free(data->net.ifname); + g_free(data->net.address); virBitmapFree(data->net.features); break; case VIR_NODE_DEV_CAP_SCSI_HOST: - VIR_FREE(data->scsi_host.wwnn); - VIR_FREE(data->scsi_host.wwpn); - VIR_FREE(data->scsi_host.fabric_wwn); + g_free(data->scsi_host.wwnn); + g_free(data->scsi_host.wwpn); + g_free(data->scsi_host.fabric_wwn); break; case VIR_NODE_DEV_CAP_SCSI_TARGET: - VIR_FREE(data->scsi_target.name); - VIR_FREE(data->scsi_target.rport); - VIR_FREE(data->scsi_target.wwpn); + g_free(data->scsi_target.name); + g_free(data->scsi_target.rport); + g_free(data->scsi_target.wwpn); break; case VIR_NODE_DEV_CAP_SCSI: - VIR_FREE(data->scsi.type); + g_free(data->scsi.type); break; case VIR_NODE_DEV_CAP_STORAGE: - VIR_FREE(data->storage.block); - VIR_FREE(data->storage.bus); - VIR_FREE(data->storage.drive_type); - VIR_FREE(data->storage.model); - VIR_FREE(data->storage.vendor); - VIR_FREE(data->storage.serial); - VIR_FREE(data->storage.media_label); + g_free(data->storage.block); + g_free(data->storage.bus); + g_free(data->storage.drive_type); + g_free(data->storage.model); + g_free(data->storage.vendor); + g_free(data->storage.serial); + g_free(data->storage.media_label); break; case VIR_NODE_DEV_CAP_SCSI_GENERIC: - VIR_FREE(data->sg.path); + g_free(data->sg.path); break; case VIR_NODE_DEV_CAP_MDEV: - VIR_FREE(data->mdev.type); - VIR_FREE(data->mdev.uuid); + g_free(data->mdev.type); + g_free(data->mdev.uuid); for (i =3D 0; i < data->mdev.nattributes; i++) virMediatedDeviceAttrFree(data->mdev.attributes[i]); - VIR_FREE(data->mdev.attributes); + g_free(data->mdev.attributes); break; case VIR_NODE_DEV_CAP_CSS_DEV: for (i =3D 0; i < data->ccw_dev.nmdev_types; i++) virMediatedDeviceTypeFree(data->ccw_dev.mdev_types[i]); - VIR_FREE(data->ccw_dev.mdev_types); + g_free(data->ccw_dev.mdev_types); break; case VIR_NODE_DEV_CAP_AP_MATRIX: - VIR_FREE(data->ap_matrix.addr); + g_free(data->ap_matrix.addr); for (i =3D 0; i < data->ap_matrix.nmdev_types; i++) virMediatedDeviceTypeFree(data->ap_matrix.mdev_types[i]); - VIR_FREE(data->ap_matrix.mdev_types); + g_free(data->ap_matrix.mdev_types); break; case VIR_NODE_DEV_CAP_MDEV_TYPES: case VIR_NODE_DEV_CAP_DRM: @@ -2479,7 +2479,7 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) break; } =20 - VIR_FREE(caps); + g_free(caps); } =20 =20 diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index be684c3512..fbb87b7acf 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -309,12 +309,12 @@ virNWFilterRuleDefFree(virNWFilterRuleDefPtr def) virNWFilterVarAccessFree(def->varAccess[i]); =20 for (i =3D 0; i < def->nstrings; i++) - VIR_FREE(def->strings[i]); + g_free(def->strings[i]); =20 - VIR_FREE(def->varAccess); - VIR_FREE(def->strings); + g_free(def->varAccess); + g_free(def->strings); =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -324,8 +324,8 @@ virNWFilterIncludeDefFree(virNWFilterIncludeDefPtr inc) if (!inc) return; virHashFree(inc->params); - VIR_FREE(inc->filterref); - VIR_FREE(inc); + g_free(inc->filterref); + g_free(inc); } =20 =20 @@ -337,7 +337,7 @@ virNWFilterEntryFree(virNWFilterEntryPtr entry) =20 virNWFilterRuleDefFree(entry->rule); virNWFilterIncludeDefFree(entry->include); - VIR_FREE(entry); + g_free(entry); } =20 =20 @@ -348,15 +348,15 @@ virNWFilterDefFree(virNWFilterDefPtr def) if (!def) return; =20 - VIR_FREE(def->name); + g_free(def->name); =20 for (i =3D 0; i < def->nentries; i++) virNWFilterEntryFree(def->filterEntries[i]); =20 - VIR_FREE(def->filterEntries); - VIR_FREE(def->chainsuffix); + g_free(def->filterEntries); + g_free(def->chainsuffix); =20 - VIR_FREE(def); + g_free(def); } =20 =20 diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index ae819024ad..18b64e373b 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -50,17 +50,17 @@ virNWFilterVarValueFree(virNWFilterVarValuePtr val) =20 switch (val->valType) { case NWFILTER_VALUE_TYPE_SIMPLE: - VIR_FREE(val->u.simple.value); + g_free(val->u.simple.value); break; case NWFILTER_VALUE_TYPE_ARRAY: for (i =3D 0; i < val->u.array.nValues; i++) - VIR_FREE(val->u.array.values[i]); - VIR_FREE(val->u.array.values); + g_free(val->u.array.values[i]); + g_free(val->u.array.values); break; case NWFILTER_VALUE_TYPE_LAST: break; } - VIR_FREE(val); + g_free(val); } =20 virNWFilterVarValuePtr @@ -302,9 +302,9 @@ virNWFilterVarCombIterFree(virNWFilterVarCombIterPtr ci) return; =20 for (i =3D 0; i < ci->nIter; i++) - VIR_FREE(ci->iter[i].varNames); + g_free(ci->iter[i].varNames); =20 - VIR_FREE(ci); + g_free(ci); } =20 static int @@ -809,8 +809,8 @@ virNWFilterVarAccessFree(virNWFilterVarAccessPtr varAcc= ess) if (!varAccess) return; =20 - VIR_FREE(varAccess->varName); - VIR_FREE(varAccess); + g_free(varAccess->varName); + g_free(varAccess); } =20 bool diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 28e75f8b59..907aa6d06a 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -140,8 +140,8 @@ virObjectEventCallbackFree(virObjectEventCallbackPtr cb) return; =20 virObjectUnref(cb->conn); - VIR_FREE(cb->key); - VIR_FREE(cb); + g_free(cb->key); + g_free(cb); } =20 /** @@ -161,10 +161,10 @@ virObjectEventCallbackListFree(virObjectEventCallback= ListPtr list) virFreeCallback freecb =3D list->callbacks[i]->freecb; if (freecb) (*freecb)(list->callbacks[i]->opaque); - VIR_FREE(list->callbacks[i]); + g_free(list->callbacks[i]); } - VIR_FREE(list->callbacks); - VIR_FREE(list); + g_free(list->callbacks); + g_free(list); } =20 =20 @@ -494,7 +494,7 @@ virObjectEventQueueFree(virObjectEventQueuePtr queue) return; =20 virObjectEventQueueClear(queue); - VIR_FREE(queue); + g_free(queue); } =20 static virObjectEventQueuePtr diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 4d7d685d6e..3341f5d83c 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -43,9 +43,9 @@ virSecretDefFree(virSecretDefPtr def) if (def =3D=3D NULL) return; =20 - VIR_FREE(def->description); - VIR_FREE(def->usage_id); - VIR_FREE(def); + g_free(def->description); + g_free(def->usage_id); + g_free(def); } =20 static int diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 0b78699589..df88a0bc72 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -105,7 +105,7 @@ virDomainSnapshotDiskDefFree(virDomainSnapshotDiskDefPt= r disk) return; =20 virDomainSnapshotDiskDefClear(disk); - VIR_FREE(disk); + g_free(disk); } =20 =20 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9aed602fd6..3f06fcaebf 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -448,15 +448,15 @@ virStorageVolDefFree(virStorageVolDefPtr def) if (!def) return; =20 - VIR_FREE(def->name); - VIR_FREE(def->key); + g_free(def->name); + g_free(def->key); =20 for (i =3D 0; i < def->source.nextent; i++) - VIR_FREE(def->source.extents[i].path); - VIR_FREE(def->source.extents); + g_free(def->source.extents[i].path); + g_free(def->source.extents); =20 virStorageSourceClear(&def->target); - VIR_FREE(def); + g_free(def); } =20 =20 @@ -497,7 +497,7 @@ void virStoragePoolSourceFree(virStoragePoolSourcePtr source) { virStoragePoolSourceClear(source); - VIR_FREE(source); + g_free(source); } =20 =20 @@ -507,16 +507,16 @@ virStoragePoolDefFree(virStoragePoolDefPtr def) if (!def) return; =20 - VIR_FREE(def->name); + g_free(def->name); =20 virStoragePoolSourceClear(&def->source); =20 - VIR_FREE(def->target.path); - VIR_FREE(def->target.perms.label); - VIR_FREE(def->refresh); + g_free(def->target.path); + g_free(def->target.perms.label); + g_free(def->refresh); if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); - VIR_FREE(def); + g_free(def); } =20 =20 diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encrypti= on_conf.c index 6a32df15b7..7fd0df70a9 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -78,8 +78,8 @@ virStorageEncryptionFree(virStorageEncryptionPtr enc) for (i =3D 0; i < enc->nsecrets; i++) virStorageEncryptionSecretFree(enc->secrets[i]); virStorageEncryptionInfoDefClear(&enc->encinfo); - VIR_FREE(enc->secrets); - VIR_FREE(enc); + g_free(enc->secrets); + g_free(enc); } =20 static virStorageEncryptionSecretPtr diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index dab5e855f5..3eaf05fe52 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -159,7 +159,7 @@ virStorageNetHostDefFree(size_t nhosts, for (i =3D 0; i < nhosts; i++) virStorageNetHostDefClear(&hosts[i]); =20 - VIR_FREE(hosts); + g_free(hosts); } =20 =20 @@ -169,8 +169,8 @@ virStoragePermsFree(virStoragePermsPtr def) if (!def) return; =20 - VIR_FREE(def->label); - VIR_FREE(def); + g_free(def->label); + g_free(def); } =20 =20 @@ -204,10 +204,10 @@ virStorageAuthDefFree(virStorageAuthDefPtr authdef) if (!authdef) return; =20 - VIR_FREE(authdef->username); - VIR_FREE(authdef->secrettype); + g_free(authdef->username); + g_free(authdef->secrettype); virSecretLookupDefClear(&authdef->seclookupdef); - VIR_FREE(authdef); + g_free(authdef); } =20 =20 @@ -314,9 +314,9 @@ virStoragePRDefFree(virStoragePRDefPtr prd) if (!prd) return; =20 - VIR_FREE(prd->path); - VIR_FREE(prd->mgralias); - VIR_FREE(prd); + g_free(prd->path); + g_free(prd->mgralias); + g_free(prd); } =20 =20 @@ -511,7 +511,7 @@ virStorageSourceNVMeDefFree(virStorageSourceNVMeDefPtr = def) if (!def) return; =20 - VIR_FREE(def); + g_free(def); } =20 =20 @@ -992,10 +992,10 @@ virStorageSourcePoolDefFree(virStorageSourcePoolDefPt= r def) if (!def) return; =20 - VIR_FREE(def->pool); - VIR_FREE(def->volume); + g_free(def->pool); + g_free(def->volume); =20 - VIR_FREE(def); + g_free(def); } =20 =20 diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomainchec= kpointobjlist.c index e09137b69b..a8025055c2 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -78,7 +78,7 @@ virDomainCheckpointObjListFree(virDomainCheckpointObjList= Ptr checkpoints) if (!checkpoints) return; virDomainMomentObjListFree(checkpoints->base); - VIR_FREE(checkpoints); + g_free(checkpoints); } =20 =20 diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentob= jlist.c index 999f4a4152..7d639c4e01 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -229,7 +229,7 @@ virDomainMomentObjFree(virDomainMomentObjPtr moment) VIR_DEBUG("obj=3D%p", moment); =20 virObjectUnref(moment->def); - VIR_FREE(moment); + g_free(moment); } =20 =20 @@ -289,7 +289,7 @@ virDomainMomentObjListFree(virDomainMomentObjListPtr mo= ments) if (!moments) return; virHashFree(moments->objs); - VIR_FREE(moments); + g_free(moments); } =20 =20 diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapsh= otobjlist.c index 7c2b63c5ae..4c7176b95e 100644 --- a/src/conf/virdomainsnapshotobjlist.c +++ b/src/conf/virdomainsnapshotobjlist.c @@ -101,7 +101,7 @@ virDomainSnapshotObjListFree(virDomainSnapshotObjListPt= r snapshots) if (!snapshots) return; virDomainMomentObjListFree(snapshots->base); - VIR_FREE(snapshots); + g_free(snapshots); } =20 =20 diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 244a168357..21ebbdb054 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -45,12 +45,12 @@ virNetworkPortDefFree(virNetworkPortDefPtr def) if (!def) return; =20 - VIR_FREE(def->ownername); - VIR_FREE(def->group); + g_free(def->ownername); + g_free(def->group); =20 virNetDevBandwidthFree(def->bandwidth); virNetDevVlanClear(&def->vlan); - VIR_FREE(def->virtPortProfile); + g_free(def->virtPortProfile); =20 switch ((virNetworkPortPlugType)def->plugtype) { case VIR_NETWORK_PORT_PLUG_TYPE_NONE: @@ -58,11 +58,11 @@ virNetworkPortDefFree(virNetworkPortDefPtr def) =20 case VIR_NETWORK_PORT_PLUG_TYPE_NETWORK: case VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE: - VIR_FREE(def->plug.bridge.brname); + g_free(def->plug.bridge.brname); break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: - VIR_FREE(def->plug.direct.linkdev); + g_free(def->plug.direct.linkdev); break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI: @@ -73,7 +73,7 @@ virNetworkPortDefFree(virNetworkPortDefPtr def) break; } =20 - VIR_FREE(def); + g_free(def); } =20 =20 diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index 28c1c3938c..a3f90b86bb 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -36,13 +36,13 @@ virNWFilterBindingDefFree(virNWFilterBindingDefPtr def) if (!def) return; =20 - VIR_FREE(def->ownername); - VIR_FREE(def->portdevname); - VIR_FREE(def->linkdevname); - VIR_FREE(def->filter); + g_free(def->ownername); + g_free(def->portdevname); + g_free(def->linkdevname); + g_free(def->filter); virHashFree(def->filterparams); =20 - VIR_FREE(def); + g_free(def); } =20 =20 diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index a6a5aa01c7..3157522eb2 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -99,7 +99,7 @@ virNWFilterObjFree(virNWFilterObjPtr obj) =20 virMutexDestroy(&obj->lock); =20 - VIR_FREE(obj); + g_free(obj); } =20 =20 @@ -109,8 +109,8 @@ virNWFilterObjListFree(virNWFilterObjListPtr nwfilters) size_t i; for (i =3D 0; i < nwfilters->count; i++) virNWFilterObjFree(nwfilters->objs[i]); - VIR_FREE(nwfilters->objs); - VIR_FREE(nwfilters); + g_free(nwfilters->objs); + g_free(nwfilters); } =20 =20 --=20 2.29.2